Slightly easier to pass compilerargs to Ant
Dev version, 130929
Retire ID_DEMO from use
Merge branch 'argent77-devel' into devel

Conflicts:
	src/infinity/resource/EffectFactory.java
Backport this from the CI branch
Fiddle around with license information and "About Near Infinity"
Merge branch 'argent77-devel' into devel

Conflicts:
	src/infinity/resource/mus/Entry2.java
Merge branch 'argent77-devel' into devel
Dev version, 131005
Merge remote-tracking branch 'upstream/devel' into devel