cleaned up merge a bit more and fixed some of the vs2010 projects
Merge branch 'master' of https://github.com/moai/moai-dev