Aktualizace stavu ke dni 25. 7.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/AdminModule/components/form/templates/settings/basicSettings.latte
	log/access.log
	log/error.log
	log/exception.log