Added template and changes
Added template and changes
Merge origin/master

Conflicts:
	web/index.xhtml
	web/registerEmployee.xhtml