提交搜索结果页

提交搜索结果页
规划师搜索和游记搜索公用一套样式，套页面的时候套两个页面
Merge branch 'master' of https://github.com/voovo/lanrenyou

Conflicts:
	FE/css/main.css
	FE/css/waper.css
	FE/imgs/main_sp.png
	FE/imgs/main_sp.psd