Final Version
Merge branch 'master' of https://github.com/JanNB/ImageEditor
Final Version (2)