Rozficany login
Merge templates
Merge branch 'master' of https://github.com/gogy27/MK-TEAM

Conflicts:
	sandbox/app/presenters/HomepagePresenter.php