Money front end implementation half working
Merge remote branch 'origin/master'