Update
Merge branch 'master' of github.com:pulpitum/auth

Conflicts:
	src/controllers/IndexController.php
	src/views/login.php