fd error
remove glog 3.0
Merge branch 'develop' of https://github.com/ketoo/NoahGameFrame into develop

Conflicts:
	NoahFrame.sln