Fix admin login and deconflict inventory functions admin and customer services
Merge branch 'cy-branch'
merging master and cy-branch
merging in progress 1