Added support for cad:attribute in xml. Stopped blank attributes being added.

Certain CAS implementations embed each attribute in the attributes -> attribute tag. This was not being handled.

If there isn't any value to the attribute then this will now not be added to the extra attributes.
Merge branch 'hotfix/add_support_for_attribute'