wip
Merge branch 'master' of https://github.com/johanfforsberg/oldpaint2

Conflicts:
	js/ui.js
css update
add bacon event bus
fix for case when fill tool does nothing