play a bit with the code and make it run (at least on my system)
Merge branch 'develop' of github.com:dennisausbremen/tunefish into develop

Conflicts:
	server/database.py
	server/models/__init__.py
	tunefish.py