Update to rails 4.0.3

Conflicts:
	Gemfile.lock