make clang happier
make PropertyMap::readJson able to parse escaped chars
Merge branch 'api_change' into c++11

Conflicts:
	lib/Core/CoreUtils/application.cpp