Modified CMakeLists.txt so to be safely used as a git submodule.
Merge branch 'master' of https://github.com/liuq/json into HEAD

Conflicts:
	CMakeLists.txt