EDMC floats new policy for spas; cross-gender massage to be