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

Conflicts:
	app/View/Test/edit.ctp
	public_html/js/test/TestApp.js
fhdsjasgr
Merge branch 'master' of https://github.com/gladcube/gcapps.git

Conflicts:
	app/View/Test/index.ctp