Repaired the look of employee view
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/classes/Controller/Tasks.php
Redirects a logged in  user