ui-bootstrap  test
model test
add base.less
搜索店铺结果页
Merge branch 'master' into ui-bootstrap-lhp

Conflicts:
	src/rhino/rhino/static/css/rhino.less
	src/rhino/rhino/static/js/rhino.js
	src/rhino/rhino/templates/index_local.html
Merge pull request #66 from lhp609661060/ui-bootstrap-lhp

Ui bootstrap lhp
Merge remote-tracking branch 'up/master' into karma
banner逻辑部分
完成样式
Merge pull request #67 from konglingkai/banner#55

完成了top banner的逻辑和样式
hotfix
Merge pull request #68 from konglingkai/hotfix

hotfix
Merge remote-tracking branch 'up/master' into karma
Modify