language update
translation update
Implement account deactivation query
Merge pull request #1674 from loomio/account-deactivation-question

Account deactivation query
vote form
Merge branch 'bootstrap3-upgrade' of github.com:loomio/loomio into bootstrap3-upgrade

Conflicts:
	app/views/votes/_form.html.haml
Merge branch 'master' into bootstrap3-upgrade

Conflicts:
	db/schema.rb
vote form