fix OrderItemControllerSpec
fix specs
merging with staging
creating description and option for city location on restaurant form