Latest changes for messaging page
Merge branch 'master' of https://github.com/TechFounder/stepup