Merge pull request #112 from srs-user-tests/master

Preparations...
Changes made during the user tests
Merge branch 'master' of github.com:srs-user-tests/srs_public
Merge branch 'master' of github.com:ipa320/srs_public