dublu
Merge branch 'master' of https://github.com/Afanc/Beast

Conflicts:
	src/GUI/Application.cc
redublu
Merge branch 'master' of https://github.com/Afanc/Beast

Conflicts:
	src/GUI/Application.cc