Switch to Rails 4.2.0.beta1
Merge branch 'master' into rails42
Merge branch 'master' into rails42

Conflicts:
	Gemfile.lock
Merge branch 'master' into rails42
Merge branch 'master' into rails42
Minor fixes.
Merge branch 'master' into rails42

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/mixins/locale_controller.rb
Fix test
Update and fix simple_form
Fix settings update
Fix deprecation in Mailer.
Merge branch 'master' into rails42

Conflicts:
	Gemfile.lock
Merge branch 'master' into rails42

Conflicts:
	Gemfile
	Gemfile.lock
Fix the test.
Fix post face date update.
Update gems
Merge branch 'master' into rails42

Conflicts:
	Gemfile
	Gemfile.lock
Update to rails 4.2.0.rc1
Some only_path deprecations.
Fix.