merge
merge
Merge branch 'master' of https://github.com/gupraga/jquery-chat

Conflicts:
	sample/sample.html
merge
Merge branch 'master' of https://github.com/gupraga/jquery-chat