Changes made for prod
Merge branch 'master' of github.com:Orasi/blue-source

Conflicts:
	config/initializers/secret_token.rb