try
Merge branch 'master' of https://github.com/CICM/HoaLibrary

Conflicts:
	Sources/juce/Source/PluginProcessor.cpp
	Sources/juce/Source/PluginProcessor.h