CMS and SPARQL query changes

not working since merging of two versions
Merge branch 'master' of github.com:NYCCSC/nyccsc-rails

Conflicts:
	Gemfile
	app/controllers/catalog_controller.rb