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

Conflicts:
	public_html/js/Gcapps.js
	public_html/js/test/TestApp.js