rebase backbone-aai against latest master

Matthias Bonn added the Architecture and Haicore description against an older Master.

I've adapted his commit and created this MR agains the lastest master.