added test-ng output to ignore files
Merge remote-tracking branch 'origin/property-tree'
new built
Merge remote-tracking branch 'origin/master' into new-serialization

Conflicts:
	tiamat-build/Launcher.jar
	tiamat-build/lib/ChatParser-0.3.jar
	tiamat-build/lib/ClientServer-0.3.jar
	tiamat-build/lib/DiceLib-0.3.jar
	tiamat-build/lib/rplib-0.3.jar
	tiamat-build/t3.jar
	tiamat-build/t3.zip