Fix warnings
Merge branch 'master' of https://github.com/chen3feng/thirdparty

Conflicts:
	jsoncpp-0.5.0/src/lib_json/BUILD
Merge remote-tracking branch 'upstream/master' into HEAD