added cashboxes to base; generic expenses finished for primary_cash
finaled edits to kpk.sql
Merge branch 'dev' of https://github.com/IMA-WorldHealth/Kapok into dev