basic changes to layout on toolbar
newly merged

Merge branch 'master' of https://github.com/jubrad/partnerproject

Conflicts:
	scripts/toolbar.js