Update annotate
Merge branch 'features/devise'
Update schema