Did stuff

Can't remember what
Merge branch 'master' of https://github.com/ChrisHersh/GenericCivClone
BLAHBLAHBLAH

Conflicts:
	NetworkCode/NetworkCodeProject/NetworkCodeProject.sdf
	NetworkCode/NetworkCodeProject/NetworkCodeProject.suo