6th revision of the editor.

Added support for custom brushes
Merge branch 'master' of https://github.com/salainen/megalomaniac_project