Updates on Conversation module
Merge branch 'master' of https://github.com/daven009/yamatoV09

Conflicts:
	client/router.js
Updates on conversation module
Grooming fading effect & Message panel
Merge pull request #6 from daven009/master

Updates on conversation module