First implementation
Merge remote-tracking branch 'origin/master'

resolved conflicts:
	virtual-rtms/pom.xml