Refactoring disaster service and adding unit tests
Merge branch 'master' of https://github.com/HTBox/crisischeckin.git