Live Chat History Mail
Chat history mail
Merge branch 'master' of https://github.com/hardik-panchal/wakeup

Conflicts:
	nbproject/private/private.xml