Merge branch 'dev' into ActiveAdminCanCan
Merge branch 'dev' into ActiveAdminCanCan
slider fix after removing turbolinks
Fixes after merge from dev
Merge pull request #108 from is-valid/ActiveAdminCanCan

Active admin can can