bit fixes
add mako templates to proposals
updates for money4 (task1)