Added error handling to BTCChina
Added Null checking for BTCChinaResponse
Resolve conflicts
Merge pull request #5 from timmolter/develop

Merge changes
#485 - reenabling tests and fixing ignored id propery
#485 - renaming also missing 1 of 4 test files
#485 - wrong last price expectation in test
#485 - logging endpoint configured for test scope
#488 - making cryptsy protected against empty (null) orders (NPE)
Merge pull request #486 from krystiannowak/develop

#485 - Tests are not run in xchange-cryptsy due to wrong file naming
Merge pull request #484 from sutra/develop

Add BTCTradeSession to ensure the polling service instancs, which using same API key, share the same secret data and nonce, and make all requests on one API key synchronized.
#489 - fix against NPE when there are no recent trades
Added CLOAK/BTC and CRYPT/BTC
Merge pull request #490 from krystiannowak/develop

#489 - fix against NPE when there are no recent trades
Merge pull request #491 from zholmes1/develop

Added CLOAK/BTC and CRYPT/BTC
#492 - fixing NPE adapting ticker in cryptsy if there are no trades
Merge pull request #493 from krystiannowak/develop

#492 - fixing NPE adapting ticker in cryptsy if there are no trades
Fix Bitstamp Last Trade Id.
Added all missing CurrencyPairs
Merge pull request #495 from zholmes1/develop

Added all missing CurrencyPairs