Merge branch 'dev' into dev-directories

Conflicts:
	nzedb/Install.php
	nzedb/Music.php