Merge branch 'master' of qmuc300924:AudioManager