changed by gil
changed by shawn
Merge branch 'trial' of https://github.com/gone369/courseengine into trial
up gil