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.
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.
Merge branch 'master' of git://github.com/openframeworks/openFrameworks into doc-ofColor
Continue updating docs.
- Move implementation comments to header.
- Use initialization lists.
- Make const argument ordering self-consistent.
- Make method spacing self-consistent.
Further implementation cleanup.