Merge branch 'develop' of github.com:openframeworks/openFrameworks
Merge branch 'BugFix-VS2012-2' of github.com:LeoColomb/openFrameworks into BugFix-VS2012-2