增加个人主页、好友动态、景点新鲜事
Merge branch 'master' of https://github.com/HowToLove/HiTrip

Conflicts:
	assets/map.html