Merge branch 'master' into allow-no-nickname

Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml

app/views/layouts/application1.html.haml

@@ -1,32 +0,0 @@
-!!!
-%html
-  %head
-    %meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
-    %title= t '.title', title: (yield(:title) or controller.controller_name)
-    = stylesheet_link_tag 'application'
-    = stylesheet_link_tag "print", :media => "print"
-    <!--[if lte IE 7]>
-    = stylesheet_link_tag 'ie_hacks'
-    <![endif]-->
-    = javascript_include_tag 'application'
-    = csrf_meta_tags
-    = yield(:head)
-  %body
-    #logininfo= render :partial => 'shared/loginInfo'
-    
-    #header
-      #logo
-        = link_to root_path do
-          = t('layouts.logo').html_safe
-        %span{:style => "color:white; font-size:45%; letter-spacing: -1px;"}= FoodsoftConfig[:name]
-      #nav= render :partial => 'layouts/main_tabnav'
-
-    #main
-      #content
-        - flash.each do |name, msg|
-          = content_tag :h3, msg, :id => "flash#{name.to_s.camelize}", :class => "flash #{name}"
-        #loader{:style => "display:none;"}= image_tag("loader.gif", :border => 0)
-        - if show_title?
-          %h1= yield(:title)
-        = yield
-    #ajax_box(style="display:none")