Merge branch 'master' of github.com:loomio/loomio into feature/edit-proposal

* 'master' of github.com:loomio/loomio: (21 commits)
  Fix group full_name migration
  Repopulate Groups full_name field
  improve-discussion-email Simplify new discussion email
  improve group archive to archive memberships too
  Remove bad schema data
  Put subgroup Add Member button in the same place as group Invite people button.
  remove next steps panel from subgroup page Fixes #831. Remove 'Next steps' panel from subgroup page.
  new help page plus tips throughout app
  Improve public groups directory
  fix spelling mistake that broke admin panel
  Disable metrics tracker for now
  Use https for metrics collector script
  Fix failing cuke
  remove groups link from homepage
  Add metrics javascript tracker to precompile list
  Deliver email in user's prefered language
  Implement public groups directory
  add changes to improve admin
  fixes #823 makes discusssion disappear instantly
  Add metrics tracking
  ...

Conflicts:
	app/views/motions/_form.html.haml