no message
Merge branch 'master' of https://github.com/magicride/fieldmaps

Conflicts:
	src/server/db.py
	src/server/server.py
	src/server/statshandler.py
	src/server/teamshandler.py
Merge branch 'master' of https://github.com/magicride/fieldmaps