前台增加主题相关文章显示
Merge branch 'master' of https://github.com/jnoodle/VZ-NPC201410

Conflicts:
	.gitignore
增加首页跳转