login and reg
Merge branch 'wensong'