Uppdaterar
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/LoginController.php
	src/LoginModel.php
	src/LoginView.php