after comments of Tobias
Merge branch 'master' of https://github.com/enwida/idpRepo
Merge branch 'master' of https://github.com/enwida/idpRepo
Merge branch 'master' of https://github.com/enwida/idpRepo
Merge branch 'master' of https://github.com/enwida/idpRepo
merge problems are fixed