Merged course and preference settings into settings
renamed tutor summary to staff summary
Merge branch 'devwq' of github.com:weiqingtoh/coursemology.org into dev/raymoond_dev