Fixed some bugs
Merge branch 'develop' of https://github.com/sharetribe/sharetribe into develop