Merge branch 'master' of github.com:loomio/loomio into feature/edit-proposal-notifies-users-who-have-voted

* 'master' of github.com:loomio/loomio:
  flash error when incorrect amount in contributions
  improve how we send discussion ids to server for inbox activity counts
  Implement INBOX BABY!
  Implement Pay what you can payment system
  spelling mistake in motion closing soon email
  update es.yml to match transifex version
  Revert "Split locale files into smaller sections"
  remove extra styling from emails
  Split locale files into smaller sections
  Tiny improvements to admin panel
  use default fonts for email
  Use GroupsTree on the side pannel of the homepage

Conflicts:
	app/models/motion.rb
	config/routes.rb
	db/schema.rb
	spec/models/motion_spec.rb