Update rails
Merge branch 'refs/heads/master' into update-dependencies

Conflicts:
	Gemfile.lock
Merge pull request #183 from seedpod/update-dependencies

Update rails