Login validation and stuffs
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/partials/nav.blade.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/partials/nav.blade.php