+
Merge branch 'master' of https://github.com/malecoin/malecoin

Conflicts:
	src/qt/macdockiconhandler.h