缩略图等
Merge branch 'master' of https://github.com/HowToLove/HiTrip

Conflicts:
	assets/js/map.ajax.js
	assets/map.html