修改几点页面显示问题
Merge branch 'master' of https://github.com/jnoodle/VZ-NPC201410

Conflicts:
	WebContent/WEB-INF/pages/search.jsp