Add We The People campaign and refactor campaigns
Merge pull request #721 from loomio/feature/we-the-people

Add We The People campaign and refactor campaigns
adjust userscontroller routes, fixes #631
fix failing woc cucumber step
spanish translation fix

update english locale to accept arg

rm unnecessary code

add more fixes for ago
Merge pull request #709 from loomio/unused-userscontroller-routes

Unused userscontroller routes
Merge pull request #722 from realdoug/master

Fix small spanish translation bug
Remove instances of redirect_to :back
Merge pull request #683 from loomio/feature/fix-errors-with-redirect-to

fix redirect-to
create mock email sender for use in testing ENV. set up email css, enhance some emails
remove mysterious config file from stylesheets
Merge pull request #693 from loomio/feature/markdown_in_mention_emails

Feature/markdown in mention emails (plus email test suite)
Fix existing proposal error.
Merge pull request #728 from loomio/bug/proposal-already-exists

Fix existing proposal error.
Merge branch 'master' into feature/new-group-wizard

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/frontpage.js
	app/assets/javascripts/main.js.coffee
	app/views/groups/_request_membership.html.haml
	app/views/motion_mailer/motion_blocked.html.haml
	app/views/motion_mailer/new_motion_created.html.haml
	app/views/user_mailer/motion_closing_soon.html.haml
	config/locales/en.yml
	db/schema.rb
	features/discussions/mention_user.feature
	features/groups/add_group_member.feature
	spec/factories.rb
	spec/models/group_request_spec.rb