Updated navigation drawer design
Finished navigation drawer (User info NYI)
Fixed VPlan bug and NPE
Merged branch master into alcros-dev

Conflicting : MainActivity.java