2013/07/02 heatmap:phase
Merge branch 'master' of https://github.com/gladcube/gcapps.git

Conflicts:
	app/View/Test/editor.ctp
	public_html/js/SiTestFactories.js
	public_html/js/test/EditorApp.js
	public_html/js/test/TestApp.js
	public_html/js/test/styleEditorBoxDirective.js
2013/07/09 iframe > iframe * 2
2013/07/10
2013/07/16 comparisonMode not implemented
2013/07/16