[31082014] - Thien commit before merge
Merge remote-tracking branch 'mooc/bs135'
BS 140831 fix fee display, teacher image Course/Index