Prepared for Version 2.0
Merged branches
Version 2.1.0 as released in the appstore
merged branches
Removed unused code / classes and added imagemodel