增加了services页面
Merge branch 'master' into projectwork
添加了单个项目页和单个作品页
Merge branch 'master' into projectwork

Conflicts:
	app/views/site/projects.html.haml
调整首页