add Maple code to compute magic colors
OpenGL: work around OSX bug (see glCheckErrorIgnoreOSXBug())
Merge branch 'workshop' of https://github.com/MrKepzie/Natron into workshop

Conflicts:
	Global/GitVersion.h