pre-merge
Merge branch 'master' of https://github.com/bcpki/bitcoin

Conflicts:
	src/DEMO.txt
	src/bcert.h
	src/bcert/bcert.proto
	src/bcert/e.py
	src/bcert/mycert.py
	src/wallet.cpp
	src/wallet.h
transfer