Finish extraction of gcx functionality into gem
Merge branch 'gcx' of github.com:thelabtech/infobase into gcx

Conflicts:
	app/controllers/gcx_sites_controller.rb
	vendor/plugins/common_engine