Changed to include architecture in Software-ID
Merge branch 'issue71-targeted-request' of https://github.com/tnc-ba/swidGenerator into issue71-targeted-request