added new data models, q promises
Merge branch 'master' of https://github.com/lichuanr/Courseplanner