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
Fix EOL - LF
ofSystemLoadDialog title on Win32
Fix arguments ofSystemLoadDialog in projectGenerator
Add ofThread argument for tryJoin time.
Change sleep time to long, to match Poco methods.
Avoid C4244: "possible loss of data" not necessarily a problem
Push WarningLevel to Level2 into VS project

Fix Part 1/3 #2526
Don't use switch with only default case
Push WarningLevel to Level3

Fix Part 2/3 #2526
Minimize conversions to float to avoid possible loss of data
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
- fixed bug where seeking would sometimes get stuck.
- improved seeking accuracy.
- fixed crashes when accessing samples at the end of a video.
- fixed texture caching issue when video was recorded.
- added methods for audio sampling.
- added methods for enabling/disabling video and audio sampling when not needed. by default sampling is on.
Merge branch 'master' into ios-videoplayer-fixes