Tman changes and a bit of optimization and Resource Manager almost ready
for testing
Merge remote-tracking branch 'origin/master'

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