Refactored project layout
Merge branch 'master' of github.com:Notificare/notificare-demo-android