Merge branch 'develop' into feature/qt-properties

# Conflicts:
#	Mapping.h
#	OscInterface.cpp
#	ProjectReader.cpp
#	ProjectWriter.cpp
#	Shape.h
#	main.cpp

Shape.cpp

@@ -19,7 +19,7 @@
 
 #include "Shape.h"
 
-MShape::MShape(const QVector<QPointF>& vertices_) {
+MShape::MShape(const QVector<QPointF>& vertices_) : _isLocked(false) {
   setVertices(vertices_);
   build();
 }