Merge pull request #25 from Code4SA/develop

Production release candidate
Merge branch 'master' of github.com:Code4SA/pmgbilltracker into develop
Bugfix: handle 'None' values in admin select fields.