change auth
remove user_store
Merge branch 'develop'