Merge branch 'manuCR'
Merge branch 'master' of https://github.com/AndonyNS/CI-1430-MiBusCR