Imported to Android Studio

I want to come back and fix the outer joins which are done so clumsily here.
Merge branch 'master' of github.com:brione/DB-Example

This is temporary. There is a new merge coming with a full import of the project into the current Android Studio.

Conflicts:
	.gitignore
	AndroidManifest.xml