chat js
fixConflict
changes in chat
fix conflict
Merge branch 'master' of https://github.com/esterr/LivepersonFirst