Upgrade to rails 4.1.0
Conflicts:
	Gemfile.lock
Upgrade foundation gem