SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
ce353819e8d274093ca47573424c97870a340252