Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/collectiondb.cpp
	src/main.cpp
	src/playerwidget.ui
	src/src.pro