.
Merge branch '#58-final' into #548-final-employees

Conflicts:
	src/wap/views/hrm/employees/formEmployeesCatalog.d
	src/wap/views/hrm/employees/formEmployeesCatalog.js