Update rails
Merge branch 'master' of github.com:thelabtech/sitrack

Conflicts:
	Gemfile.lock