Updates...
Added icon, other changes
Added instructions for deploying on a Mac
Merge branch 'develop' into f/mac_fix

Conflicts:
	src/main.cpp