Merge pull request #988 from moaiforge/1.5-stable

1.5 stable
Merge pull request #990 from moaiforge/develop_plus_1.5

Develop plus 1.5
integration of development-1.5 with develop
re-merge with 1.5 merge from halfnelson
fixes after merge to build cleanly on windows
Merge branch 'develop' into develop_plus_1.5
fixes to get code working in visual studio 2012 (and probably others)
restore freeglut files
add missing compat macros for windows
add missing includes
fix cmake build system with new tess and moai-crypto libraries
fix cmake build system to force static_xml expat headers