Commit at 4:29 am

I hate Edgar
Merge remote-tracking branch 'origin/Design' into Design

Conflicts:
	CourseManagementSystem/CourseManagementSystem.v12.suo

	CourseManagementSystem/CourseManagementSystem/App_Data/aspnet-CourseManagementSystem-20141022045713.mdf

	CourseManagementSystem/CourseManagementSystem/App_Data/aspnet-CourseManagementSystem-20141022045713_log.ldf