commit16
Merge remote-tracking branch 'origin/master'

Conflicts:
	Semestralka/target/Semestralka-1.0-SNAPSHOT/Employee/addActor.xhtml