troll teleport
Merge branch 'master' of https://github.com/SinZ163/TrollsAndElves

Conflicts:
	tools_thumbnail_cache.bin