updated kram und so
update
Merge branch 'master' of https://github.com/glisur/ImageEditor