Merge pull request #316 from lrozanski/master

Fixed MIFOS-6040: Can't start Mifos using default generated CF war
Fixed MIFOS-6039: Total collections displayed wrong in the collection sheet