Updated code for server
fixed minor stuff
Merge branch 'canvas/o2s-working'
Merge branch 'master' of https://github.com/smliao/MOOCentral