Add GR stuff for infobase
Update CE
Merge branch 'master' of github.com:CruGlobal/infobase

Conflicts:
	Gemfile
	Gemfile.lock