updates
changes
Merge branch 'master' of ssh://github.com/weshack/WesPartyMap

Conflicts:
	server/database/__init__.pyc