syllabus
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebCTToMoodlePlugin/webcttomoodle/classes/model/Syllabus.php