before merge
Merge branch 'development' of https://github.com/ofoso/ofo into development
production model 1.0; finish long renter
Merge branch 'development' of https://github.com/ofoso/ofo into development