work 0103
Merge branch 'master' of https://github.com/joechen1018/linklies

Conflicts:
	app/View/Pages/home.ctp
work 0108