Refactor to handle huge data for MH-551
Merge branch 'master' of github.com:thelabtech/missionhub