Teleport basic functionality
Merge branch 'master' of https://github.com/SnowblindFatal/tim

Conflicts:
	src/game/FileHandler.cpp
	src/game/GameObject.cpp
	src/game/Level.cpp
Merge branch 'master' of https://github.com/SnowblindFatal/tim