class2json
Merge branch 'master' of https://github.com/ziphirum/tangmoman

Conflicts:
srwo/common.php
Merge branch 'master' of https://github.com/ziphirum/tangmoman