Update gems
Merge branch 'master' of github.com:CruGlobal/sp

Conflicts:
	Gemfile.lock
Update rails