SIGN IN SIGN UP

merged with 2.0

T
Tony Tam committed
7c47454f19c685a79ff19776194b27d55d3144a3