Merge branch 'master' of github.com:ging/fi-ware-idm into stable
Merge branch 'stable' of github.com:ging/fi-ware-idm into stable
email fix