Merge pull request #145 from sharetribe/develop

Develop to master
Update translations
Merge pull request #147 from sharetribe/develop

Add mercury editor to terms and privacy pages