Rails 4.0.3 migration
Merge branch 'master' into bs3

Conflicts:
	Gemfile.lock