Fix new case

fixed in both the manager and the employee screens
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/project.properties