SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
42fb840f227f4952194ad8dee3175ed7af4c4fdd