fix bugs
Merge branch 'master' of https://github.com/trunone/GPPlatformMain

Conflicts:
	Framework/include/Normalrand.h
	Framework/src/math/Normalrand.cpp