Dev version, 130929
Retire ID_DEMO from use
Merge branch 'devel' into devel-ci

Conflicts:
	src/infinity/gui/BrowserMenuBar.java
	src/infinity/resource/ResourceFactory.java