Added Cancan and free member role
Merge branch 'develop'