reverted ignoring of project.properties
Merge branch 'master' of https://github.com/wangyif2/GroceryOTG
Merge branch 'master' of https://github.com/wangyif2/GroceryOTG
Adding skeleton for notifications
Merge branch 'master' of https://github.com/wangyif2/GroceryOTG