Changes for gcx integration
Start factoring out to use gcx gem
Update CE
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
Use lower case letters
Update gems
change a setting name
Make sure we have the cas url
Add staging env to settings
Don't want settings.local.yml
Fix admin link
Merge branch 'master' into gcx

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	config/application.rb
	config/routes.rb
	db/schema.rb
	vendor/cache/guard-1.6.1.gem
	vendor/cache/guard-1.7.0.gem
	vendor/cache/guard-1.8.1.gem
	vendor/cache/rails-3.1.10.gem
	vendor/cache/rails-3.1.12.gem
	vendor/cache/rails-3.2.13.gem
cru.org/s => gcx.org
www -> wpdev (for staging)
Merge branch 'master' into gcx
wording tweaks
use variable for url