Merge branch 'master' of https://github.com/wavesoft/LiveQ
Fixed conflict