trajectory generator: unit tests improved
Merge remote-tracking branch 'upstream/develop' into develop
old executor and executor service classes removed
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	test/data
Merge remote-tracking branch 'upstream/develop' into develop