some cleanup around changes
fixed bug with simpeleffects
implemented merging of layers. Closes #93
Merge branch 'master' of https://github.com/PaintDotJava/Paint.JAVA