using annotate.
Merge remote-tracking branch 'remotes/origin/feature/admin-side'
add cancan