Before merging Bob's Update
Merger Bob's update
Everything working except recovery (need to call batch processing again lah..)
Merge branch 'master' of https://github.com/kai33/Proj_CICMS