Merge branch 'dev' of https://github.com/johhor/id2210-vt14 into dev

Conflicts:

	resourcemanager/src/main/java/resourcemanager/system/peer/rm/ResourceManager.java