...
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugin/jquery.zzchat.run.js