Merge branch 'develop' of https://github.com/cpacia/BitcoinAuthenticator into develop

Conflicts:
	testwallet/.gitignore

Conflicts:
	testwallet/.gitignore