Merge pull request #895 from oliverds/master

Bug Fixes
Added i18n strings
On edit advertisements preserve selected location
Chat widget #898
Merge remote-tracking branch 'upstream/master'