Upgrade to rails 4.1 beta
Merge branch 'master' into feature/rails_4.1

Conflicts:
	Gemfile
	Gemfile.lock
Upgrade to rails 4.1.0rc1