Updating bump Rails and update all gems
Merge branch 'master' of github.com:larslevie/lina

Conflicts:
	Gemfile.lock