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

Conflicts:
	app/View/Test/editor.ctp
	public_html/js/test/EditorApp.js
	public_html/js/test/styleEditorBoxDirective.js
aslkdfj