adjust the code structure , mainly for sync
Merge branch 'master' of https://github.com/XMUCobra/MyTravo

Conflicts:
	Server/travo/templates/website/detail_travel.html