add controller API - not tested
improve controller API
Merge remote-tracking branch 'zoe/master'

Conflicts:
	dockontroller/server/lib/controller.coffee
merge zoe