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

Conflicts:
	Gemfile.lock
Merge branch 'master' into feature/79657814-spot-process-colors

Conflicts:
	Gemfile.lock