Merge branch 'master' into rails_4_upgrade

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock