Homepage..
Merge branch 'master' of https://github.com/er777/gb

Conflicts:
	app/View/Layouts/homepage.ctp