refactor, add query
fuckall
cleanup
Merge branch 'database_connections'
query
Merge branch 'master' of https://github.com/gestone/WaterFountain

Conflicts:
	app/src/main/java/hack/com/waterfountain/MainActivity.java