Fixed error where disabled category could get selected
Added code to ensure that attribute updates are actually registered
Merge pull request #1096 from duncanka/master

Partially fixed UI issues with attribute values (particularly defaults)
Merge remote-tracking branch 'upstream/master'