resetup
Merge branch 'master' into setup

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml
	config/initializers/secret_token.rb