.
.
Merge branch '#76-HoverEdit2' into #58-final
new logic
.
Merge branch '#76-HoverEdit2' into #58-final

Conflicts:
	src/wap/server/webrender.d
	src/wap/views/_root/mainMenu.js
alpha
.
Merge branch '#76-HoverEdit2' into #58-final
.
.
Merge branch '#76-HoverEdit2' into #58-final
alpha
Merge branch '#548-final-employees' into #58-final

Conflicts:
	src/wap/views/admin/refs/users/formUsersMaster.ui
.
переход на usercontrols
.
Merge branch '#58-final' into #548-final-employees

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