Bug fixes, 4REAL
Merge branch 'master' of https://github.com/sharetribe/sharetribe-ios