minor changes and TODOs
Merge branch 'master' of ssh://git@github.com/stapl-dsl/stapl-core.git

Conflicts:
	src/main/scala/stapl/core/package.scala