fix some rollout related bugs
Merge branch 'master' of github.com:CruGlobal/MissionHub-Android