Editace a potvrzeni ze strany koordinatora
Merge branch 'master' of github.com:magdakutisova/ebozp

Conflicts:
	application/modules/audit/Bootstrap.php
	application/modules/audit/controllers/CheckController.php
	application/modules/audit/views/scripts/check/get.phtml
	application/modules/audit/views/scripts/check/index.phtml
	public/js/audit/check/edit.js
Oprava chybneho merge