manual routed buses
Merge branch 'develop' of github.com:KlausMerkert/Bonsai into develop

Conflicts:
	js/controllers/cpuCtrl.js