Merge remote-tracking branch 'origin/stable-1.0'

Conflicts:
	CMakeLists.txt
	data/CMakeLists.txt
	include/SampleBuffer.h
	plugins/CMakeLists.txt
	plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp
	src/core/SampleBuffer.cpp

include/PianoRoll.h

@@ -54,6 +54,9 @@ class PianoRoll : public QWidget, public SerializingObject
 {
 	Q_OBJECT
 public:
+	/*! \brief Resets settings to default when e.g. creating a new project */
+	void reset();
+
 	void setCurrentPattern( pattern * _new_pattern );
 
 	inline void stopRecording()