Several bug fixes!
Merge remote-tracking branch 'origin/Semi-final' into Semi-final

Conflicts:
	main/html/base_settings.php
	main/html/create_base.php