SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
caf13161168c609add707d71e75aa0ca1c30e801