Merge branch 'master' of github.com:credentials/irma_configuration
Merge branch 'master' into demo