Merge branch 'issue_60' into financial
issue_78: add, edit, list expense types
issue_78: fix Add link not highlighted when in New page. Clean up