Fixed some bugs
Back Button of PlanActivity now working
Merge branch 'master' into alcros-dev