Fix workbench build. Was not including junit for BNDLIB.
Fix controller build.
Merge branch 'master' into testRunner

Conflicts:
	interactivespaces-workbench/build.gradle