Revert 84b32c5..15ec099

This rolls back to commit 84b32c569957b64cf3d55487da0c4bca70aa5423.
Merge branch 'master' of https://github.com/XMUCobra/MyTravo

Conflicts:
	travoprototype/travo/templates/travo/test.html