SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
4dcfdf6572882bafabab42c25c21007ff0e9bc4d