Commit from Labs today
Merge https://github.com/PClmnt/TheCraftCompany

Conflicts:
	app/View/About/about.ctp
	app/View/Home/index.ctp