OSX changes

Conflicts:
	blocknet-qt.pro