Added toolbars, fixed #11
Merge branch 'master' of https://github.com/Fumler/www-p2

Conflicts:
	js/pages.js