test
Merge branch 'master' of https://github.com/markus-wi/antares.git

Conflicts:
	antares/src/com/emveyh/antares/core/GlobalConfig.java