[07092014] - Thien commit before merge bs135
Merge remote-tracking branch 'mooc/bs135'
[07092014] - Thien commit...elogo.png
BS 140909 fixbug 30,39,40