project detail
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/Tpl/Home/Project/detail.html
	Public/Home/css/style.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/Tpl/Home/Project/detail.html
	Public/Home/css/style.css