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

Conflicts:
	public_html/html/profile-box.html
	public_html/slim/profile-box.slim
Merge branch 'master' of https://github.com/gladcube/gcapps

Conflicts:
	app/View/Home/index.ctp
Merge branch 'master' of https://github.com/gladcube/gcapps