Merge branch 'develop'
Merge branch 'develop'
+ Mantis 0002643: New column for average monthly expenditure for NS
* fix improper object definition causing crash
Merge branch 'hotfix/improperObjectDefinition' into develop