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
added UIViewControllerBasedStatusBarAppearance and set it to false,
this ensures that status bar is hidden on iOS7.
+ cleaned up the ordering of the plist, was all over the place, now it seems its a bit more organised.
+ removed CFBundleIconFile as it was empty. all icons are stored in CFBundleIcons
remove unused mesh setName() in assimp
Merge pull request #2837 from admsyn/fix-unused-setname-assimp

Remove ofMesh setName() in ofxAssimpModelLoader
fixes #2829 ofVbo custom attribute stride

addresses an issue where the buffer length would be calculated wrongly if stride for a custom ofVbo attribute was set to 0.

Based on @cinghiale's suggestion, and the ensueing discussion.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Merge pull request #2839 from tgfrerer/fix-ofVboStride

fixes #2829 ofVbo custom attribute stride
fixes #2593 by disabling uniqueShader for Raspberry Pi
Merge pull request #2840 from jvcleave/uniqueShader-disabled

fixes #2593 by disabling uniqueShader for Raspberry Pi