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