Retire ID_TUTU from use
Merge branch 'devel' into devel-ci

Conflicts:
	src/infinity/resource/ResourceFactory.java
Fix some inappropriate uses of FileCI