Merge branch 'master' into SafetyBranch
Camera Fixed
Merge branch 'SafetyBranch'

Conflicts:
	Violins/src/Composition.cpp
conflict resolution