fixes
Merge branch 'master' of github.com:cosmosgenius/expense-frontend