Merge branch 'dev' of https://github.com/clydegale/vocal_front
Merge branch 'master' of https://github.com/clydegale/vocal_front