updates
Merge branch 'master' of github.com:vincentpaca/new_offerchat