Fixed VPlan bug and NPE
Merged branch master into alcros-dev

Conflicting : MainActivity.java