Minor fixes to locales.
Fixed a conflict
Fixed issues in welcome email
Merge branch 'develop' of https://github.com/sharetribe/sharetribe into develop