modified
Merge branch 'master' of https://github.com/choxxy/crayteus-isohandler.git

Conflicts:
	src/org/crayteus/iso/formats/FormatManager.java
	src/org/crayteus/tests/unitests/FormatManagerTest.java
	src/test/XmlParser.java
	target/classes/test/XmlParser.class