.
.
Merge branch '#66-BioSmartUI' into #66-BioSmartUI-PersonCtrl

Conflicts:
	WAP.qcd
	src/wap/views/hrm/biosmart/formBioSmartMain.d
.
.
Merge branch '#66-BioSmartUI' into "#66-BioSmartUI-PersonCtrl"
Conflicts:
          src/wap/views/hrm/biosmart/formBioSmartMain.d
.
#66 Добавил элементы выбора подразделений и сотрудников
Merge branch '#66-BioSmartUI-PersonCtrl' into #66-BioSmartUI

Conflicts:
	src/wap/views/common/resources/ctrlResourcesEditor.js
	src/wap/views/hrm/biosmart/formBioSmartMain.css
	src/wap/views/hrm/biosmart/formBioSmartMain.d
	src/wap/views/sms/properties/formSimPropertyMaster.js