Merge Openidc branch

Implementation of the AA module (Master Thesis done by Alberto Blazquez)