add dialect support
Merge branch 'master' into dialects

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/unstructured/_main.css.scss
	app/mailers/discussion_mailer.rb
	app/mailers/user_mailer.rb
	app/models/concerns/is_translatable.rb
	app/views/admin/email_templates/_form.html.haml
	config/routes.rb
Merge pull request #1571 from loomio/dialects

add dialect support