Merge pull request #30 from LeoColomb/master

Fix LinkIncremental for Release VS2012
adds support for addon_config.mk
Addon: add support for osx in addon_config.mk parsing
Merge pull request #31 from arturoc/feature-addon_config

adds support for addon_config.mk
ofAddon.cpp: fix excludes for include paths
fix windows cbp project
Merge branch 'feature-addon_config' of github.com:arturoc/projectGeneratorSimple into feature-addon_config
Merge pull request #32 from arturoc/feature-addon_config

Feature addon config
fix projectGenerator to use the rollbacked ofxXmlSettings
Merge branch 'master' of https://github.com/ofZach/projectGeneratorSimple

Conflicts:
	projectGenerator.cbp
updated osx project for ofxGui
Merge pull request #33 from kylemcdonald/master

re-adding ofxGui to pg for xcode project
xcodeProject: generate makefiles for osx