fixed bugs
fixed bugs
Fixed bug in db
Merge branch 'master' of https://github.com/brunogonncalves/ZPlan_App_Android