Bug fixing

Messaging and device list
Merge pull request #5 from habibvirji/master

Messaging and device list updates