Merged all dev branches into master

The release incorporates changes that rationalized the different NTbuilds (NT console vs. WINXP). With this version, we can now build both the nt console and Win32 Gui version in one build.

Also, incorporates mouse wheel support into the nt console build.