SIGN IN SIGN UP

Merge branch 'dev' into sqlite2

D
Dax Raad committed
2619acc0ffebdaccfdec9dc0c999257e68e9d3fb