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

Conflicts:
	client/router.js