First JSON-RPC stubs.
JSON-RPC stuff and better locking.
Merge branch 'develop' into jsonrpc
JSON-RPC initial implementation.
Better building. Don't need JSON-RPC now.