I have login page with two fields username and passwords
Merge remote-tracking branch 'origin/staging' into staging

Conflicts:
	app/config/autoload.php