Added database readerwriter
Merge branch 'master' of https://github.com/tog000/appathon_athena

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml