fixes #762
change options button to use icon button template
add margin-bottom to headers
Merge pull request #869 from loomio/heading_styles

add margin-bottom to headers
Set user language preference through param[:locale].

This is a bit quick and dirty and is crying out for a refactor but I'm confident it will work and I really want it to be live asap. The idea is that we can announce new languages and say 'click here to use Loomio in Romanian'. also I want to make a footer that has the list of languages across the bottom of every page.
add user email field
language change

This change makes it a lot easier for translators to convert
the edited-when-by-who string into their own language.

Incidentally we need to fix our time formatting asap I reckon,
those 'ago's don't translate very well.
Merge pull request #872 from loomio/hotfix/language

language change
Merge pull request #870 from loomio/set-language-pref-through-param

Set user language preference through param[:locale].
Merge pull request #860 from loomio/refactor/standardise-group-options-button

Standardise group options button and refactor icon-button helper
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
Merge pull request #874 from loomio/design/fixes

Little improvements to yesterday's design upgrade
Minor language change
Merge pull request #863 from loomio/feature/change-emails

Add ability to change your email
Merge pull request #855 from loomio/bug/fix-cancel-confirm-error

add code to prevent double popup error when canceling send invite confirm - fixes #762
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