Resources spaces
Merge branch 'master' of github.com:C4AProjects/Cory

Conflicts:
	www/sites/all/modules/custom/cory_updates/cory_updates.install