Added fields to the Country Allocation and Equity ORMs.
Merge branch 'master' of github.com:gazzman/finalysis