Fixed x86 debug/release errors (dll, includes, dependancies)
Optimized the surface class when loading assets
Merge branch 'master'