Database implementation. Ungetestet!
unfinished yet
database
forced commit
forced commit
Merge branch 'feature_database'

Conflicts:
	Android/AndroidManifest.xml
	Android/res/layout/start_layout.xml
	Paper/mockups.pdf