Merge branch 'hotfix/0.2.1'
add remember token
Merge branch 'hotfix/0.2.2' into develop