merged conflicts
signup changes on Mac
signup changes on Mac
master commit signup