some bugs solved
Merge remote branch 'origin/master' into mixed_clients

Conflicts:
	views/beehub_directory.php