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/shared/_auto_complete_articles.html.haml

@@ -1,4 +0,0 @@
-%ul.autocomplete
-  - for article in @articles
-    - supplier = @supplier ? "" : " - #{truncate(article.supplier.name)}"
-    %li{:id => article.id.to_s}= "#{article.name} (#{article.unit_quantity} * #{article.unit} | #{number_to_currency(article.price)}#{supplier})"

app/views/shared/_auto_complete_users.rhtml

@@ -1,5 +0,0 @@
-<ul class="autocomplete">
-<% for user in @users do -%>
-  <li><span class="nick"><%= show_user(user) %></span><span class="informal"> (<%= user.ordergroup.try(:name) %>)</span></li>
-<% end -%>
-</ul>

app/views/shared/_loginInfo.haml

@@ -1,9 +0,0 @@
-%ul
-  %li
-    = image_tag 'b_user.png' , :size => '7x10',  :border => 0, :alt => t('.profile')
-    = link_to h(@current_user.nick), my_profile_path, { :title => t('.edit_profile') }
-  - if FoodsoftConfig[:homepage]
-    %li= link_to FoodsoftConfig[:name], FoodsoftConfig[:homepage], { :title => t('.homepage_title') }
-  %li= link_to t('.help'), FoodsoftConfig[:help_url]
-  %li= link_to t('.feedback.title'), new_feedback_path, :title => t('.feedback.desc')
-  %li= link_to t('.logout'), logout_path

app/views/shared/memberships/_current_members.rhtml

@@ -1,21 +0,0 @@
-<% if flash[:error] %>
-  <h3 class="error" id="flashError" ><%= flash[:error] %></h3>
-  <%= javascript_tag("new Effect.Highlight('flashError', {delay:0.8, duration:1});") -%>
-<% end %>
-
-<% memberships = @group.memberships 
-   if memberships.size != 0 %>
-<ul style="">
-    <% for membership in memberships %>
-      <li style="margin-left:-15px">
-        <%= show_user membership.user, full: true, markup: true %>
-         | <%= link_to_remote t('.drop'), 
-                :url => { :controller => '/memberships', :action => 'drop_member', :id => @group, :membership_id => membership },
-                :before => "Element.show('loader')",
-                :success => "Element.hide('loader')" %>
-       </li>
-    <% end %>
-</ul>
-  <% else %>
-<p><i><%= t('.no_members', group: @group.name) %></i></p>
-  <% end %>

app/views/shared/memberships/_members.rhtml

@@ -1,23 +0,0 @@
-<h1><%=h t('.title', group: @group.name) %></h1>
-<p>
-    <i><%= t('.desc', link: remote_link_to(t('.invite'), :url => new_invite_path(:id => @group))).html_safe %></i>
-</p>
-<div class="left_column" style="width:48%">
-    <div class="box_title">
-        <h2><%= t('.already_members') %></h2>
-    </div>
-    <div class="column_content" id="members">
-        <%=render :partial => 'shared/memberships/current_members' %>
-    </div>
-</div>
-<div class="right_column" style="width:48%">
-    <div class="box_title">
-        <h2><%= t('.no_members_yet') %></h2>
-    </div>
-    <div class="column_content" id="non_members">
-        <%= render :partial => 'shared/memberships/non_members' %>
-		<%= remote_link_to(t('.invite_someone'), :url => new_invite_path(:id => @group)) %>
-    </div>
-</div>
-
-<div id="edit_box" style="display:none"></div>

app/views/shared/memberships/_non_members.rhtml

@@ -1,11 +0,0 @@
-<ul>
- <% for user in @group.non_members %>
-  <li>
-    <%= show_user user, full: true, markup: true %>
-    | <%= link_to_remote t('.add'), 
-        :url => { :controller => '/memberships', :action => 'add_member', :id => @group, :user_id => user },
-        :before => "Element.show('loader')",
-        :success => "Element.hide('loader')" %>
-  </li>
- <% end %>
-</ul>