Changed outer div id and reinstated message-container div.
Merge branch 'messages' into cas

* messages:
  Changed outer div id and reinstated message-container div.