fixed server-web stuff
merge
Merge branch 'master' of https://github.com/rupertcw/CloudCartoon
job equals DONE