fix vc compile error
Merge branch 'develop' of https://github.com/benloong/TrinityCell into develop

Conflicts:
	src/core/CMakeLists.txt