nu werkte zeker
Merge branch 'master' of https://github.com/cwout/Faceless

Conflicts:
	TowerDefense/src/entities/map/Map.as
Merge branch 'master' of https://github.com/cwout/Faceless