note
Merge branch 'master' of https://github.com/CloudEDU/CloudEDUClient

Conflicts:
	CloudEDU/CloudEDU.sln
Merge branch 'master' of https://github.com/CloudEDU/CloudEDUClient

Conflicts:
	CloudEDU/CloudEDU/CourseStore/CourseOverview.xaml.cs