fixed chat photo problem
Merge branch 'james'