Merge branch 'develop' of github.com:sdbmich1/plumboard
Merge branch 'release-1.092'
Merge branch 'release-1.092'
turned on ability to read category model for cancan to fix looping problem
update categories controller and ability.rb file for cancan
Merge branch 'issue-001' into develop