T-2 commit 7
Merge branch 'T-2' of https://github.com/bartoszborysewicz/herezad into T-2

Conflicts:
	app/Controller/AppController.php
T-2 commit 7