Merge pull request #79 from ushahidi/messages-dev

Messages Section
Merge branch 'master' of github.com:ushahidi/pingapp into messages-dev