Merge met FTP/GitHub Sync
Merge origin/master

Conflicts:
	layout/add_course.php