implemented greendao and database structure
Merge branch 'master' of https://github.com/g-mac/AdamWest

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml