names are match between message and comment - further changes are following
Merge branch 'master' of https://github.com/froehr/Disaster-Management-2014