Merged prod to staging
Modified assigning appointment types to company and user