User kram DB
Merge branch 'master' of https://github.com/AndroidEntwicklung/FuFloMa

Conflicts:
	src/com/example/fufloma/MainActivity.java