Update devise config. Fix token_authentication deprecation warnings
Do not use spaces after opening and before closing braces
Merge branch 'devise-fix-config'

Conflicts:
	config/application.rb
	config/initializers/wrap_parameters.rb