notificationService
Merge branch 'master' of https://github.com/izzui/learning-channel

Conflicts:
	LearningChannel/app/views/course-unsub.html
	LearningChannel/app/views/course.html
Merge branch 'master' of https://github.com/izzui/learning-channel.git