Merge branch 'master' of https://github.com/openframeworks/openFrameworks

Conflicts:
	.gitignore
	apps/devApps/_DeployExamples/deployExamples.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/openframeworks/openFrameworks

Conflicts:
	libs/openFrameworks/types/ofBaseTypes.cpp
Merge branch 'master' of https://github.com/openframeworks/openFrameworks

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/openframeworks/openFrameworks