[03092014] - Thien commit before merge bs135 17h26
Merge remote-tracking branch 'mooc/bs135'
[04092014] - Thien commit mornigh 04/09 for tester
[04092014] - Thien commit
mix
Merge branch 'master' into bs135
BS 140905 implement comment feature