dashboard to takahiro
Merge branch 'master' of https://github.com/gladcube/gcapps.git

Conflicts:
	public_html/js/home/HomeApp.js