Icons added for Debug and Release for OS X - option to modify icons for specific projects
Merge branch 'icons' of github.com:openframeworks/openFrameworks into icons
linux icon
ofAppRunner: linux, moved icon creation code to setupOpenGL so it can be overwritten from main
ofAppGlutWindow: linux, fix icon initialiation
feature: icons for vs2010 and codeblocks
Merge branch 'icons' of https://github.com/openframeworks/openFrameworks into icons
merge upstream
priority events + ofEventMarkAttended + attended and priority for ofxGui
merge develop
Icons for VS2012
Icons for VS2012

Be sure to accept modifications about icons
VS2012 PreprocessorDefinitions
Improve .vcxproj for icons
Final .vcxproj for icons

/D_DEBUG not optional
Merge branch 'develop' into feature-priorityAttendedEvents

Conflicts:
	libs/openFrameworks/events/ofEventUtils.h
ofDelegate + ofxGui with return value
Merge branch 'develop' of github.com:openframeworks/openFrameworks into feature-priorityAttendedEvents
merge upstream
ofBaseApp: fix keyReleased event