moved couchpotato to user, instead of site
if CouchPotato not set, don't show
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	Changelog