Odhlasenie
Merge origin/master

Conflicts:
	sandbox/app/presenters/AuthPresenter.php
Solution for conflicts
Revert "Solution for conflicts"

This reverts commit 6b16e7ba4f40544b9918660b99214fe341ab007b.
Revert "Odhlasenie"

This reverts commit 67847c7dffef4cb478c82877ef7bfe7e69a75f8a.