* Store the media type in the TIMESTAMP column, so we can force a rescan if the user changes the media type configuration.
Merge branch 'master' into vfolders

Conflicts:
	scanner.c