Fixed tilemap and added completeset for test_map_1
Merge branch 'master' into demo
Added tilemap to first level.
Merge remote-tracking branch 'origin/demo' into demo
Merge remote-tracking branch 'origin/master' into demo

Conflicts:
	HighExplosives/src/Game/HiExLevel.ls