wiw
Merge branch 'server_test' of https://github.com/nmcalabroso/Push into server_test

Conflicts:
	client/manager.py
	game/resources.pyc