Merge pull request #44 from maybeyond/adjusting

Adjusting
optimize shopping backend
optimize settings for staging server
Merge pull request #46 from konglingkai/opt

Some optimization
starting the re-resign of the filter
从后台获取数据到前端渲染

调整了分页功能
Update requirements.txt
edit models and adjusting
Merge branch 'master' into adjusting
点击分类响应搜索结果
re-structure the server side
点击分类会跳到搜索页面
Merge pull request #47 from lhp609661060/lhp

从后台获取数据到前端渲染
Merge branch 'master' into opt

Conflicts:
	src/rhino/rhino/static/js/app/detail.js
	src/rhino/rhino/static/js/controllers/filternarrow.js
	src/rhino/rhino/static/js/controllers/searchresult.js
小调整
Merge pull request #48 from konglingkai/opt

一些代码优化
首页4个tab页显示数据
merge
lower