Commit working TOD dialog on windows

The dialog works on windows. There is a bug where the dialog does not
close.
Working tod menu system.
Mereged Ian to be merged into master
Fixed unhandled merged conflict
Fixed merge conflicts from water simulation
Merge pull request #8 from CSUNProjectAnarchy/master

Getting latest update