Removed a redundent MAC ifdef block.
Added windows rc file.
Added missing .rc files.
Cleared merge conflict