Change name of class Image to ImageDrawEntity (inconvenient name
collisions with java.awt.Image).
Import java.awt.Image instead of using full name.
Merge branch 'refactor'