+ database
Merge branch 'master' of https://github.com/Developmino/Automotive-Rep

Conflicts:
	Parkafari/src/de/tum/automotive/parkafari/MainActivity.java
Merge branch 'master' of https://github.com/Developmino/Automotive-Rep

Conflicts:
	Parkafari/src/de/tum/automotive/parkafari/MainActivity.java