Fixed all the windows compile errors and project reorg with the exception of the more complex problem in Parser.cpp
make life easier for Makefiles
Merge pull request #196 from nicocesar/develop

make life easier for Makefiles
Merge pull request #201 from programmerTim/develop

Fixed all the windows compile errors and project reorg with the exceptio...