proximity database framework. noch sehr buggy
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/res/values/strings.xml