Maj
Merge branch 'master' of https://github.com/treemo/otougo_server

Conflicts: