SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
30a918e9d47de5133c2bd7fbfb7cb14a6e3aae86