fix requirements.txt conflict
Merge branch 'master' of https://github.com/zonyitoo/sysubbs-apiserver