wp
Merge branch 'master' of github.com:ging/fi-ware-idm
gemfile
fix merge gemfile