Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' into dev-egandt-anime

Conflicts:
	misc/testing/DB_scripts/populate_anidb.php
	www/lib/anidb.php
	www/pages/anime.php