added price for services
updated rest.sh
updated services serviceType validation to look for 'lodging', not 'resort' to correspond to default value
Merge branch 'master' into boris