add cancan
Merge branch 'dev' into admin_role
Merge pull request #105 from is-valid/admin_role

Admin role
Merge pull request #106 from is-valid/687comments

687comments
Merge branch 'dev' into 687comments
fix timeout for popup block