Fix to employee logins and the header.
Merge branch 'development'

Conflicts:
	application/views/templates/header.php
Misc fixes