Merge branch 'master' of https://github.com/openframeworks/openFrameworks
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
Add ofThread argument for tryJoin time.
Change sleep time to long, to match Poco methods.
osx build: remove dependency on Carbon

The only real remaining dependency I found was SetSystemUIMode() which has can be simply replaced by NSApplication:setPresentationOptions.

NB: I also tried to update scripts/osx/template/emptyExample.xcodeproj but my Xcode 5 installation seemed to re-write the entire project file (I assume it was automatically upgraded) so the diff was *way* larger than necessary. Leaving that out for now.
osx emptyProject template: remove dependency on Carbon
remove setName from ofMesh
remove unused string name in ofMesh
Fixes typo in ofxCvImage that broke getRoiPixelsRef, fixes #2520
ofThread overhaul, documentation. Example fixes.
Merge branch 'master' of github.com:bakercp/openFrameworks into enhancement-ofThread-join

Conflicts:
	examples/utils/threadExample/src/main.cpp
	examples/utils/threadExample/src/ofApp.cpp
	examples/utils/threadExample/src/ofApp.h
Const corrections, further docs and variable name changes.
Atomic, private member variables.
Cleanup.
Cleanup examples.
Merging changes.
Update documentation to proposed style.
Undoing cleanup.
Continued unclean up.
In progress documentation of ofColor.