SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
25f3d6d5a9458dcc0d86ee4fa2820a0835335356