Fixed all dev bugs for MIL-257
Merge branch 'master' of https://github.com/crdschurch/utilities