modify blog a bit
fix things
better multisite
fix alert-error
Merge branch 'upstream-development' into dev-features

Conflicts:
	modules/main/views/main_module_management.php