Merge branch 'master' of github.com:loomio/loomio into refactor/remove-phase-and-fix-close-date-issue

* 'master' of github.com:loomio/loomio:
  Bugfix: parent members couldn't request membership to subgroups
  Disable requesting membership to subgroups
  Remove sign in banner
  impliment open membership-requesting
  Add error catching on stats script
  Minor language change
  Little improvements to design upgrade #853 Darken highlight colour Fix padding on discussion index list Fix divider Fix padding below comments Shrink & lighten time to close text to fix long times to close (e.g. '38 minutes to close') being hidden and to bring them into line with out utility text Tidy up proposals panel
  language change
  add user email field
  Set user language preference through param[:locale].
  add margin-bottom to headers
  add function to export users as csv
  update language
  change design and css accross the site
  change options button to use icon button template
  Add Hungarian and Romanian translations
  fixes #762

Conflicts:
	spec/models/user_spec.rb