journey增加
Merge branch 'master' of https://github.com/lantianlz/qiexing

Conflicts:
	www/journey/urls.py
	www/journey/views.py