testing dev
Merge branch 'master' of https://github.com/goethewins/EzBit-BitCoin-API--Wallet

Conflicts:
	codeigniter/api/config/config.php