OSX changes

Conflicts:
	blocknet-qt.pro
Merge pull request #1 from atcsecure/osx

OSX changes