Merge pull request #333 from jamespedwards42/develop

Complete CryptoTrade Implementation & Unit Tests
formatting [ci skip]
Merge branch 'develop' of github.com:timmolter/XChange into develop

Conflicts:
	xchange-examples/pom.xml
formatting, organize imports [ci skip]
Cex.io timestamp conversion fixed
Merge pull request #334 from br0x/develop

Cex.io timestamp conversion fixed
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	xchange-bter/src/main/java/com/xeiam/xchange/bter/service/polling/BTERPollingTradeServiceRaw.java