catching up
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/division-elearning-project

Conflicts:
	code/ElearningCourseAnswer.php
	code/ElearningCourseQuestion.php