Merge branch 'master' of https://github.com/jansil/ServicePlattform
Merge branch 'master' of https://github.com/jansil/ServicePlattform

Conflicts:
	TP/Process/Router.cls.xml