create employee form adjustment
Merge remote-tracking branch 'origin/master'

Conflicts:
	libs/form_generator.php