Merge Oisin's changes into the master repo

Oisin has added the basics of the chat window for a particular user, and altered the navigation between the main activity and the display message activity.