SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
ab13c1d1c4877a44112e478092b825fa015c9770