fix bug with free-form, and add eraser support
Merge branch 'master' of http://github.com/oduaht/PaintApp