Edit format of the money to give view
Merge branch 'hotfixes' into develop