Merge branch 'master' into frameworks

Conflicts:
	src/CMakeLists.txt
	src/collection/entryfilter.cpp
	src/editor/editor.h
	src/editor/summarywordwidget.cpp
	src/editor/vocabularyview.h
	src/parleymainwindow.h
	src/vocabulary/leitnerview.cpp