update macos x binaries
ubuntu binary
Merge branch 'master' of https://github.com/zenithcoin/ZenithCoin

Conflicts:
	distribution/ubuntu/12.04/x86_64/zenithcoind