Database included
Merge remote-tracking branch 'origin/master'

Conflicts:
	SoberApp/app/build.gradle
Merge branch 'master' of github.com:fldpi/SoberApp
Merge branch 'master' of github.com:fldpi/SoberApp
Database include in progress