Merge branch 'master' of github.com:webnotes/erpnext into customer-login

website/templates/html/outer.html

@@ -1,6 +1,7 @@
 {% extends "lib/templates/base.html" %}
 
 {% block body %}
+	{% include "app/website/templates/html/navbar.html" %}
 	<div class="container">
 		<div class="pull-right" style="margin:4px;" id="user-tools">
 			{% if shopping_cart_enabled -%}
@@ -22,7 +23,6 @@
 			<div class="col-md-12">{{ banner_html }}</div>
 		</div>{% endif %}
 		<div class="outer">
-			{% include "app/website/templates/html/navbar.html" %}
 			<div class="content row" id="page-{{ name }}" style="display: block;">
 			{%- block content -%}
 			{%- endblock -%}