some changes
remove user
Merge branch 'master' of https://github.com/wonabru/bitcoin

Conflicts:
	bitcoin-qt.pro.user