fix some rollout related bugs
Merge branch 'master' of github.com:CruGlobal/MissionHub-Android
Merge branch 'dev'
release 2.6
perpare 2.7-SNAPSHOT