Added timeline directive for course - Lijin
Fixed conflicts.
Merge branch 'master' of https://github.com/baabte/baabtra

Conflicts:
	angularModules/course/partials/Partial-addCourse.js
	config.js