Spaaaace

Fixed spacing, also readded the autopop helper
Merge remote-tracking branch 'origin/Caroline' into Laura

Conflicts:
	CAPPamari.Web/Models/CourseModel.cs