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

Conflicts:
	.htaccess
	codeigniter/api/controllers/api.php
	install/db_api.sql.txt
bootstrap
Merge remote-tracking branch 'origin/master'