* added initial changes to handle the pop of task placeholders
Merge branch 'master' of https://github.com/dacav/id2210-vt14

Conflicts:
	resourcemanager/src/main/java/resourcemanager/system/peer/rm/ResourceManager.java
TaskInfo -> Task -> RmTask