sprint6
Merge branch 'master' of https://github.com/AguaiSolutions/vms
sprint 6 demo code