Merge branch 'master' of ssh://bitbucket.org/bilthon/fullerene

src/main/java/de/bitsharesmunich/graphenej/Main.java

@@ -66,6 +66,7 @@ public class Main {
 //        test.testGetRelativeAccountHistory();
 //        test.testLookupAssetSymbols();
 //        test.testGetBlockHeader();
-        test.testGetLimitOrders();
+        //test.testGetLimitOrders();
+        test.testGetTradeHistory();
     }
 }