controller changes
Merge branch 'develop' of github.com:aravindgd/chat_app into develop