Windows OS

debugging
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/bin/incodr/gamemode/adventure/levels/AdventureLevel1.class