Fix application icon on Mac osx
Merge pull request #112 from robvanmieghem/appicon

Fix application icon on Mac osx
Merge commit '3aa0620d44b982445cc5f74e25273f42b51df202'

* commit '3aa0620d44b982445cc5f74e25273f42b51df202':
  Fix application icon on Mac osx

Conflicts:
	src/qt/bitcoingui.cpp