Add messages controller
Merge branch 'feature/messages_controller' into develop