better multisite
fix alert-error
Merge branch 'upstream-development' into development

Conflicts:
	modules/main/views/main_module_management.php
Merge remote-tracking branch 'origin/development' into development