scaffold user
hard reset
Merge branch 'develop'