店铺结果页列表
Merge branch 'master' into search_shop

Conflicts:
	src/rhino/rhino/static/js/app/search.js
	src/rhino/rhino/static/partials/search_shop_list.html
搜索店铺结果页地图模式模版
跑马灯修改
filter上面的产品图片跑马灯效果实现
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
后台接口