Fix merge conflict.
Fix merge conflict.

jlcurby/NobleCoin,Geekcoin-Project/Geekcoin,kigooz/smalltest,jul2711/jucoin,tobeyrowe/smallchange,Blackcoin/blackcoin,kigooz/smalltestnew,bfroemel/smallchange,svcop3/svcop3,Kabei/Ippan,erikYX/yxcoin-FIRST,celebritycoin/investorcoin,HerkCoin/herkcoin,3lambert/Molecular,celebritycoin/investorcoin,HerkCoin/herkcoin,erikYX/yxcoin-FIRST,elacoin/elacoin,akabmikua/flowcoin,tobeyrowe/BitStarCoin,SandyCohen/mincoin,koltcoin/koltcoin,jul2711/jucoin,kigooz/smalltest,ychaim/smallchange,Open-Source-Coins/EZ,jlcurby/NobleCoin,pevernon/picoin,svcop3/svcop3,ychaim/smallchange,akabmikua/flowcoin,SandyCohen/mincoin,jul2711/jucoin,kigooz/smalltestnew,pevernon/picoin,HerkCoin/herkcoin,tobeyrowe/BitStarCoin,tobeyrowe/KitoniaCoin,Open-Source-Coins/EZ,elacoin/elacoin,akabmikua/flowcoin,Twyford/Indigo,Open-Source-Coins/EZ,akabmikua/flowcoin,pevernon/picoin,SandyCohen/mincoin,Geekcoin-Project/Geekcoin,pevernon/picoin,creath/barcoin,ychaim/smallchange,tobeyrowe/KitoniaCoin,Kabei/Ippan,celebritycoin/CelebrityCoin,Twyford/Indigo,creath/barcoin,Blackcoin/blackcoin,3lambert/Molecular,Credit-Currency/CoinTestComp,mortalvikinglive/bitcoinlight,mortalvikinglive/bitcoinlight,pevernon/picoin,mortalvikinglive/bitcoinlight,tobeyrowe/smallchange,erikYX/yxcoin-FIRST,TheOncomingStorm/logincoinadvanced,mortalvikinglive/bitcoinlight,celebritycoin/CelebrityCoin,mortalvikinglive/bitcoinclassic,mortalvikinglive/bitcoinclassic,bfroemel/smallchange,Geekcoin-Project/Geekcoin,Kabei/Ippan,koltcoin/koltcoin,mortalvikinglive/bitcoinlight,celebritycoin/investorcoin,Blackcoin/blackcoin,jlcurby/NobleCoin,Credit-Currency/CoinTestComp,SandyCohen/mincoin,tobeyrowe/BitStarCoin,creath/barcoin,Twyford/Indigo,bfroemel/smallchange,tobeyrowe/KitoniaCoin,elacoin/elacoin,HerkCoin/herkcoin,Twyford/Indigo,svcop3/svcop3,3lambert/Molecular,elacoin/elacoin,tobeyrowe/KitoniaCoin,kigooz/smalltestnew,Charlesugwu/Vintagecoin,3lambert/Molecular,mortalvikinglive/bitcoinclassic,celebritycoin/CelebrityCoin,kigooz/smalltest,mortalvikinglive/bitcoinclassic,Geekcoin-Project/Geekcoin,jlcurby/NobleCoin,kigooz/smalltest,erikYX/yxcoin-FIRST,ychaim/smallchange,tobeyrowe/BitStarCoin,koltcoin/koltcoin,tobeyrowe/smallchange,Kabei/Ippan,Charlesugwu/Vintagecoin,koltcoin/koltcoin,Blackcoin/blackcoin,celebritycoin/CelebrityCoin,jul2711/jucoin,Open-Source-Coins/EZ,SandyCohen/mincoin,celebritycoin/investorcoin,creath/barcoin,celebritycoin/investorcoin,Charlesugwu/Vintagecoin,TheOncomingStorm/logincoinadvanced,Blackcoin/blackcoin,HerkCoin/herkcoin,elacoin/elacoin,Credit-Currency/CoinTestComp,svcop3/svcop3,TheOncomingStorm/logincoinadvanced,mortalvikinglive/bitcoinclassic,akabmikua/flowcoin,bfroemel/smallchange,Kabei/Ippan,Open-Source-Coins/EZ,jlcurby/NobleCoin,bfroemel/smallchange,TheOncomingStorm/logincoinadvanced,svcop3/svcop3,Credit-Currency/CoinTestComp,celebritycoin/CelebrityCoin,koltcoin/koltcoin,kigooz/smalltestnew,tobeyrowe/smallchange,Credit-Currency/CoinTestComp,Charlesugwu/Vintagecoin