SIGN IN SIGN UP

Merge dev into sqlite2

D
Dax Raad committed
eeb235724b3d858745c00653c005e8f35c26d9e6