Build on OS X 10.9
Merge remote-tracking branch 'upstream/master' into osx

Conflicts:
	catcoin-qt.pro
Merge pull request #4 from ambethia/osx

Build on OS X 10.9