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

Conflicts:
	app/View/Test/edit.ctp
	public_html/js/test/changeEditorBoxDirective.js
	public_html/js/test/htmlEditorBoxDirective.js
	public_html/js/test/styleEditorBoxDirective.js
hgmumg
321321
Merge branch 'master' of https://github.com/gladcube/gcapps.git

Conflicts:
	public_html/js/Gcapps.js
	public_html/js/test/TestApp.js
fgf
Merge branch 'master' of https://github.com/gladcube/gcapps.git

Conflicts:
	app/View/Test/editor.ctp