socialadmin compatibility
cleanup

Conflicts:
	hbook.plugin.php