Mini fix in functional_test template
Bootstrap 3.2
Rails 4.1.2
Add user password reset mail preview...
Merge ../x0y0

Conflicts:
	Gemfile.lock
	test/mailers/previews/user_mailer_preview.rb
	vendor/assets/stylesheets/bootstrap-theme.css