Put in an empty object for messages and notifications
Messages and notifications are an array
Add messages when loading a page
Merge branch 'master' into messages
Merge branch 'messages'