Building initial
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/nl/sest/gamejam/controller/MapLoader.java