fix bug
Merge branch 'master' of github.com:pmrowla/pysrcds

Conflicts:
	srcds/objects.py