Made modifications to add course.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/aim/service/AimService.java
Added import statements.