Renaming folders
Altering paths to match new file names
Merge branch 'compass-install' of github.com:CruGlobal/CruOrg into compass-install

Conflicts:
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/static/Rakefile