Fix blacklist button issue
Merge remote-tracking branch 'origin/master' into db_refactor

Conflicts:
	pages/profile.php