Mayor, council ease marijuana dispensary restrictions