new branch test
地图搜索
abc
Merge remote-tracking branch 'upstream/master' into mybranch

Conflicts:
	src/rhino/rhino/static/js/services/search.js
	src/rhino/rhino/static/partials/search.html
	src/rhino/rhino/static/partials/search_result.html
	src/rhino/rhino/templates/index.html
首页tab，列表/地图模式
Merge remote-tracking branch 'rich/mybranch' into testrich
fix the image loading for @tgp8410
Merge pull request #1 from konglingkai/testrich

rich, 这是修改image loading以后的结果
Merge pull request #33 from rich-tang/mybranch

首页Tab，地图列表、捆包列表已完成