Merge branch 'master' of https://github.com/GENERALBYTESCOM/batm_public

Conflicts:
	server_extensions_api/src/com/generalbytes/batm/server/extensions/ICurrencies.java

README.md

@@ -11,7 +11,7 @@ All source code is released under GPL2.
 Content
 =======
 * **server_extensions_api** - contains extension api that all extensions use to extend BATM Server's functionality.
-* **server_extensions_extra** - reference extension implementation that implements BTC, LTC, DOGE and MAX coin support functionality.
+* **server_extensions_extra** - reference extension implementation that implements BTC, LTC, DOGE, GLD and MAX coin support functionality.
 
 Build information
 =================

server_extensions_api/src/com/generalbytes/batm/server/extensions/ICurrencies.java

@@ -26,7 +26,6 @@ public interface ICurrencies {
     public static final String LEO = "LEO";
     public static final String NLG = "NLG";
 
-
     public static final String CZK = "CZK";
     public static final String EUR = "EUR";
     public static final String USD = "USD";

server_extensions_extra/res/batm-extensions.xml

@@ -114,7 +114,7 @@
             <param name="price" />
             <cryptocurrency>GLD</cryptocurrency>
         </ratesource>
-        <cryptologo cryptocurrency="GLD" file="gulden.png"/>
+        <cryptologo cryptocurrency="GLD" file="gld.png"/>
     </extension>
 
-</extensions>
+</extensions>

server_extensions_extra/src/com/generalbytes/batm/server/extensions/extra/guldencoin/GuldencoinExtension.java

@@ -85,7 +85,7 @@ public class GuldencoinExtension implements IExtension{
             StringTokenizer st = new StringTokenizer(sourceLogin,":");
             String exchangeType = st.nextToken();
 
-            if ("guldenfix".equalsIgnoreCase(exchangeType)) {
+            if ("gldfix".equalsIgnoreCase(exchangeType)) {
                 BigDecimal rate = BigDecimal.ZERO;
                 if (st.hasMoreTokens()) {
                     try {