Merge branches 'dev' and 'master'
Merge branch 'master' of https://github.com/tusharbabbar/CamChatFb