Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:gregorwagner/gaia
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote branch 'upstream/master'
[M] modify soundManager to fit the new scenario of volume change
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
[F] lint error
Merge branch 'master' of github.com:gregorwagner/gaia
Merge remote-tracking branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
introduction to user sorting
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
update test-agent add APP env option to test-agent-test so you can run only one app