Merge branch 'refactoring'

Conflicts:
	data/CMakeLists.txt
	data/blacklisted_effects.txt
	effects/frei0r_alpha0ps.xml
	src/CMakeLists.txt
	src/clipitem.cpp
	src/core/widgets/colorpickerwidget.h
	src/core/widgets/dragvalue.cpp
	src/core/widgets/dragvalue.h
	src/customtrackview.cpp
	src/customtrackview.h
	src/dvdwizard.cpp
	src/effectstackview.cpp
	src/geometrywidget.cpp
	src/keyframehelper.cpp
	src/main.cpp
	src/mainwindow.cpp
	src/monitormanager.cpp
	src/nolib/qtimerWithTime.h
	src/plugins/projectparts/notes/noteswidget.cpp
	src/plugins/projectparts/notes/noteswidget.h
	src/transitionsettings.cpp
	src/utils/resourcewidget.cpp