fix for msvc11 (remove some c++11 stuff)
Merge branch 'master' of https://github.com/hpicgs/cg2sandbox.git