adjust network timeout
Merge branch 'master' of github.com:diclophis/MemoryLeak

Conflicts:
	src/SuperStarShooter.cpp