Fix update.php logic for logged-in users
Fix update.php logic for logged-in users
Merge branch 'master' of beesbuzz.biz:git.beesbuzz.biz/FeedOnFeeds

Conflicts:
	update.php