Develop + manual merge

This build allows me to run Coop games.

Issues: 
1 - For some reason, some of the Air units created before the start of the day do not fall out of the sky when killed, leaving wrecks hovering in the air.
2 - Wrecks in general are broken. Structures on water should not sink, especially naval factories, as this messes up all sorts of crap.
3 - There are still problems with getting the map to show up in the map list for some reason. I have to launch the normal coop mode, select map, then launch develop branch.