fixed signin to work again, also resolve merge conflicts from last master pull #93

Closed DEbinger closed 7 years ago