little changes
Merge branch 'master' of https://github.com/retn/prophylaxe.git

Conflicts:
	app/src/de/hawlandshut/rueckfallprophylaxe/db/Database.java