Merge branch master of github.com:miseyu/pozica-server
modify timeline method
modify good method
Merge branch master of https://github.com/miseyu/pozica-server
Merge branch master of github.com:miseyu/pozica-server