Data objects and new style conversation controller
Colors and headings
Merge branch 'feature/conversationlayout' into Development