Merge branch 'dev' into 'dev-stupidrenderer'

# Conflicts:
#   src/Image/IntelliImage.cpp
#   src/Image/IntelliRasterImage.cpp
#   src/Image/IntelliShapedImage.cpp
#   src/Layer/PaintingArea.cpp

src/Image/IntelliImage.h

@@ -24,8 +24,8 @@ public:
  * \brief The Types, which an Image can be.
  */
 enum class ImageType {
-        Raster_Image,
-        Shaped_Image
+		RASTERIMAGE,
+		SHAPEDIMAGE
 };
 
 protected:
@@ -132,7 +132,7 @@ virtual std::vector<QPoint> getPolygonData(){
 }
 
 virtual ImageType getTypeOfImage(){
-    return TypeOfImage;
+		return TypeOfImage;
 }
 
 /*!