.
Merge branch 'master' of https://github.com/whitecoin-org/whitecoin

Conflicts:
	src/qt/res/icons/Whitecoin.ico
Merge branch 'master' of https://github.com/whitecoin-org/whitecoin

Conflicts:
	src/qt/forms/addressbookpage.ui
Merge branch 'master' of https://github.com/whitecoin-org/whitecoin
Changes in setup configuration
Merge branch 'master' of https://github.com/whitecoin-org/whitecoin