Merge branch 'workshop'

Conflicts:
	Gui/Resources/OpenColorIO-Configs
	README.md
Add new submodules
Remove double submodule OpenColorIOconfigs
Merge branch 'workshop'
Merge branch 'workshop'
Merge branch 'master' into workshop