edit employee update
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/resources/views/editEmployee.html
Merge branch 'master' of https://github.com/adrian1sacuiu/Qameleon