coll
ssMerge branch 'master' of https://github.com/Afanc/Beast

Conflicts:
	src/GUI/Application.cc
	src/GUI/FenetreGL.cc