Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

stock/doctype/item/item.js

@@ -193,4 +193,6 @@ cur_frm.cscript.copy_from_item_group = function(doc) {
 
 cur_frm.cscript.image = function() {
 	refresh_field("image_view");
+	
+	if(!cur_frm.doc.description_html) cur_frm.cscript.add_image(cur_frm.doc);
 }

website/templates/html/outer.html

@@ -3,8 +3,10 @@
 {% block body %}
 	<div class="container">
 		<div class="pull-right" style="margin:4px;" id="user-tools">
+			{% if shopping_cart_enabled -%}
 			<a href="cart" title="Shopping Cart"><i class="icon-shopping-cart"></i> 
 				<span class="cart-count"></span></a> |
+			{%- endif %}
 			<a id="login-link" href="login">Login</a>
 		</div>
 		<div class="pull-right hide" style="margin:4px;" id="user-tools-post-login">