Fixed some problems on OSX
Merge commit '89cb8404f81625e1d904073cf8626e3b32cdb273' into 0.6.0

Conflicts:
	redis-desktop-manager/redis-desktop-manager.pro
Fixed error in jsoncpp on Mac OSX