Thien commit
Merge remote-tracking branch 'mooc/bs135'
[13092014] - Thien commit
[14092014] - Thien commit...
[14092014]-Thien commit
[15092014] - Thien commit
Merge remote-tracking branch 'mooc/bs135'
[15092014] - Thien commit...
BS140915 fix bug