Fixed some compile issues with MSVC
Merge branch 'master' of https://github.com/objectcomputing/mFAST

Conflicts:
	src/mfast/json/json_encode.cpp