Bump rails to 4.0.5
Remove unneded broken test
Merge branch 'master' into redesign

Conflicts:
	Gemfile.lock
	spec/controllers/admin/contacts_controller_spec.rb