Changes made by keith bernard (keith.bernard@nationalrescue.net).
Merge branch 'master' of https://github.com/keithbernard/nr-demo.git