游记详情页面渲染
Merge branch 'master' of https://github.com/lantianlz/qiexing

Conflicts:
	www/templates/journey/journey_detail.html