:
Merge branch 'master' of https://github.com/xpush/messengerX

Conflicts:
	www/popup-chat.html