Merge branch 'master' of github.com:loomio/loomio into feature/start-group-sign-up

* 'master' of github.com:loomio/loomio:
  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
  change options button to use icon button template
  fixes #762

Conflicts:
	app/assets/stylesheets/main.css.scss
	app/assets/stylesheets/pages.css.scss