SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
db908deee53fd2344069bbc8ec8ad6be0588e853