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

config/locales/en.yml

@@ -646,7 +646,7 @@ en:
         title: Invoice %{number}
     order_articles:
       edit:
-        stock_alert: 
+        stock_alert: The price of stock articles cannot be changed!
         title: Update article
       new:
         title: Add delivered article to order
@@ -858,10 +858,7 @@ en:
     no_ordergroups: You are unfortunately not a member of an ordergroup.
     ordergroup:
       account_summary: Account Statement
-      description: description
-      funds: ! 'Available credit:'
       invite: Invite a new Person
-      people: People
       search: Search ...
       title: My ordergroup
     ordergroup_cancelled: You cancelled membership of the group %{group}.
@@ -911,8 +908,6 @@ en:
     ordering:
       confirm_change: Modifications to this order will be lost when you change the order. Do you want to lose the changes you made and continue?
   layouts:
-    application1:
-      title: Foodsoft - %{title}
     email:
       footer: ! '--
 
@@ -1372,28 +1367,6 @@ en:
       search_user: Search user
       title: Weekly jobs
       user_not_found: No user found
-    loginInfo:
-      edit_profile: Edit profile
-      feedback:
-        desc: Found a bug? Suggestions? Review?
-        title: Feedback
-      help: Help
-      homepage_title: Visit Foodcoop Homepage
-      logout: Logout
-      profile: Profile
-    memberships:
-      current_members:
-        drop: remove
-        no_members: ! '%{group} has no members.'
-      members:
-        already_members: Are already members
-        desc: Here you can manage members of the group or invite a new Foodcoop-member to the group %{link}.
-        invite: invite
-        invite_someone: Invite someone
-        no_members_yet: Are not members yet
-        title: Members of %{group}
-      non_members:
-        add: add
     open_orders:
       ending: Ending
       no_open_orders: There are no current orders
@@ -1421,7 +1394,6 @@ en:
           name: Please modify
         edit_stock_article:
           price: <ul><li>Price changes are forbidden.</li><li>If necessary, %{stock_article_copy_link}.</li></ul>
-        supplier: 
       supplier:
         min_order_quantity: The minimum amount which has to be orderd will be shown during the order process and should motivate ordering
       task: