SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
fcc903489b3838b8e35d2829d48bb5f99acd30e0