SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
ac1606814074c971638de0b311c07a1351268f0e