asdfasdf
Merge branch 'master' of https://github.com/gladcube/gcapps.git

Conflicts:
	app/View/Test/edit.ctp