user auth and local merge complete
Merge pull request #12 from nullet/user_auth_complete

user auth and local merge complete