update fire station Birkenwerder
update database.db
update database.db
Merge branch 'master' of https://github.com/Helmie/alarm_display

Conflicts:
	database.db
	model/models.py