build error fixes - Lijin
Merge branch 'master' of https://github.com/baabte/baabtra

Conflicts:
	app.less
Merge branch 'master' of https://github.com/baabte/baabtra
chenged return value of callback function of course timeline
Conflicts:
	app.less