fixed cancan issue
Merge branch 'dev' into cancan
Checking all up to date
Cancan now working, but can't test everything (e.g. deletions) yet.