mix
Merge branch 'master' into bs135
BS 140905 implement comment feature
[07092014] - Thien commit