Merge pull request #171 from boersmamarcel/messagecenter

Merge Messagecenter
Merge pull request #172 from boersmamarcel/messagecenter

Users are not allowed to send message to themselves! *hotfix*
Merge branch 'master' into messagecenter