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
Merge branch 'develop' of https://github.com/openframeworks/openFrameworks
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.
Update gitignore structure.

Refactor out gitignore in /other/serialTest.
Add some more noticable headers.
Some simplifaction and restructuring.
Clean up some files.
Refactor out lib platform gitignore files.
Refactor out some gitignore files from AdvancedImageLoading.
Remove erroneously committed XCode project components. Closes #2057.
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
gitignore: correct comment spacing, minor updates.
Minimize conversions to float to avoid possible loss of data
bind defaultShader in setup() for RPi/GLProgrammable

This fixes an issue in the Programmable GL Renderer where RPi would not have the default shader bound when a drawing call was issued in update().

Fixes issue #2593

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>