DATABASELESSSSSSS
Merge branch 'master' of github.com:kevhui/Android-ShoppingApp

Conflicts fixed