Add BridJ to new build.
Make controller start up properly. Part way for workbench.
Update merge from local master.