priority events + ofEventMarkAttended + attended and priority for ofxGui
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
ofBaseApp: fix keyReleased event
added natural sort order for ofDirectory::sort(). closes #2045.
Merge branch 'icons' of github.com:LeoColomb/openFrameworks
Ignore icon.rc in examples
Fix icon.rc includes in project
Merge pull request #16 from tgfrerer/feature-elinuxProgrammableGL

Feature elinux programmable gl
ofAppGLFWWindow: linux icon
Merge branch 'feature-elinuxProgrammableGL' of github.com:arturoc/openFrameworks into feature-elinuxProgrammableGL
Merge pull request #2096 from LeoColomb/Fix-IconVS2012

Fix Icon VS2012
added comment regarding ofParameter typedef friending
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop