Merge branch 'master' of https://github.com/openframeworks/openFrameworks
Add ofThread argument for tryJoin time.
Change sleep time to long, to match Poco methods.
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.
bugfix / feature - detects when an OF app has been launched as a Retina / HiDpi app and applies the pixel scale to all window related calls.
fix indent and duplicate #ifdef in ofAppGLFWWindow
Merge branch 'master' of git://github.com/openframeworks/openFrameworks into enhancement-ofThread-join
Attempting to match oF style.
dev doxygen.
Added description for getHeight()
Merge pull request #1 from mlsptn/master

Added description for getHeight()
Added documentation for ofDrawAxis()