fixed toolbar events
removed old toolbar
Update toolbartest.js
Update toolbartest.js
Update toolbartest.js
added tool selection to the toolbar
Merge remote-tracking branch 'origin/kilian'

Conflicts:
	client/index.html
	client/js/toolbartest.js
Merge branch 'master' into brian