Timestamps added.
Merge remote-tracking branch 'origin/master'

Conflicts:
	common/src/main/java/common/configuration/Configuration.java
	resourcemanager/settingfiles/input0.conf
	tman/src/main/java/tman/system/peer/tman/TMan.java