fix

Conflicts:
	web/resources/views/editEmployee.html