[30082014] - Thien commit before merge bs135
Merge remote-tracking branch 'mooc/bs135'
[31082014] - Thien commit
BS 140831 fix fee display in form