a
AS
Merge branch 'master' of https://github.com/CourseMates/CourseMates

Conflicts:
	Code/CourseMate/CourseMate.Web/Service References/CMwcf/CourseMates.xsd
	Code/CourseMate/CourseMate.Web/Service References/CMwcf/CourseMates1.xsd
	Code/CourseMate/CourseMate.Web/Service References/CMwcf/CourseMates2.xsd
	Code/CourseMate/CourseMate.Web/Service References/CMwcf/CourseMates3.xsd
	Code/CourseMate/CourseMate.Web/Service References/CMwcf/Reference.cs
	Code/CourseMate/CourseMate.Web/Service References/CMwcf/Reference.svcmap
	Code/CourseMate/CourseMate.Web/Service References/CMwcf/configuration.svcinfo
	Code/CourseMate/CourseMate.Web/Service References/CMwcf/configuration91.svcinfo
	Code/CourseMate/CourseMate.Web/Web References/CMwcf/CourseMates.xsd
	Code/CourseMate/CourseMate.Web/Web References/CMwcf/CourseMates0.xsd
	Code/CourseMate/CourseMate.Web/Web References/CMwcf/CourseMates1.xsd
	Code/CourseMate/CourseMate.Web/Web References/CMwcf/CourseMates2.xsd
	Code/CourseMate/CourseMate.Web/Web.config