fix a bug in the nav
店铺结果页列表
Merge branch 'master' into search_shop

Conflicts:
	src/rhino/rhino/static/js/app/search.js
	src/rhino/rhino/static/partials/search_shop_list.html
搜索店铺结果页地图模式模版
优化了搜索结果
地图控件调整
修改地图bug
Merge branch 'master' into searchresult

Conflicts:
	src/rhino/rhino/static/js/app/common.js
Merge branch 'master' into searchresult
Merge branch 'master' into searchresult

Conflicts:
	src/rhino/rhino/static/js/app/common.js
bug fixes
跑马灯修改
filter上面的产品图片跑马灯效果实现
ready
Merge remote-tracking branch 'lhp/search_shop' into mergelhp

Conflicts:
	src/rhino/rhino/static/js/app/search.js
	src/rhino/rhino/static/partials/filter.html
	src/rhino/rhino/static/partials/search_package_list.html
	src/rhino/rhino/static/partials/search_result.html
	src/rhino/rhino/static/partials/search_shop_list.html
后台接口
Merge pull request #77 from konglingkai/searchresult

Searchresult