fixes
Merge branch 'development'

Conflicts:
	application/views/templates/header.php
Misc fixes
Fixes to the login function for employees.