fix
Merge origin/master

Conflicts:
	module/App/src/App/Controller/AppController.php
	module/App/src/App/Model/MaszynyTable.php
Merge origin/master

Conflicts:
	module/App/src/App/Controller/AdminController.php
	module/App/src/App/Controller/AppController.php
	module/App/src/App/Model/MaszynyTable.php
Merge origin/master

Conflicts:
	module/App/src/App/Controller/AdminController.php
	module/App/src/App/Controller/AppController.php
	module/App/src/App/Model/MaszynyTable.php
Merge origin/master