Merge branch 'ctb-cv-app-dev' into cv-app-xtof
refactored login module
Merge branch 'cv-app-xtof' into ctb-cv-app-dev
fixed onflict