SIGN IN SIGN UP

Merge commit 'ef1e00602987078cbbcce0bc5926c43866843e78' into dev

D
David Benson committed
ae773c8961452e8d2e1d9cc8891fc5c2339d68b8