cancan gem installed, added work to controllers, ability class & controllers. Not working, do not merge with dev branch
non-working cancan gem for debugging
Fixes for devise
merge local branch
fixed merge conflict
cancan permissions fixed and bug-free
Trying to fix merge.
Fixed merge conflicts.
Merging dev branch