Go
GoASD
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/Views/Manage/courses.html