JC: minor change before pull
JC: tried to merge.
Merge branch 'master' of github.com:emclab/projectx
Conflicts:
	app/controllers/projectx/application_controller.rb