SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
2de1c82bf7187a16f056a4b10ec6bc9a56e74453