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

Conflicting : MainActivity.java
Added Bug Report v1 to settings
Implemented events (not completed)
Implemented events (completed)
Completed events 2
Merge branch 'master' into alcros-dev
Implemented mensa