Merge branch '#66-BioSmartUI' into "#66-BioSmartUI-PersonCtrl"
Conflicts:
          src/wap/views/hrm/biosmart/formBioSmartMain.d
.