Messages and Invites are displayed correctly
Merge branch 'master' of github.com:ese-unibe-ch/ese2014-team6