Replace uniqueness test to check that a user can't have two Items with the same name; check that a Category can't be associated with the same Item more than once
Merge branch 'master' into displays
Don't rescue the exception when trying to add a category to an item twice
Merge branch 'master' into displays