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
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.
Cleanup and further documentation.
Bugfix for getHueAngle().
setHueAngle() bugfix.
Continued updates.
Continued documentation.
Merge branch 'master' of https://github.com/openframeworks/openFrameworks

Conflicts:
	.gitignore
fixes #2593 by disabling uniqueShader for Raspberry Pi
Merge pull request #2840 from jvcleave/uniqueShader-disabled

fixes #2593 by disabling uniqueShader for Raspberry Pi
Merge branch 'master' of https://github.com/openframeworks/openFrameworks
renamed project to compile correctly for iOS
fix for orientation call
Merge pull request #2842 from NickHardeman/master

iOS Example Fixes
fix critical issue w/ ofVbo shallow copies (custom attributes)

* fixes an issue where custom vbo attributes (and their buffers) would not be retained whenever the vbo was shallow copied, since the copy constructors would not copy them over from their mom object.
* this is might have especially tripped you up when you wanted to create & then store vbos in a c++ vector, since push_back does initialise by copy, and you'd have lost all your attributes upon pushing the new ofVbo to your storage vector...

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