Updated repository paths, because most of the changes are merged by upstream.
Merge branch 'master' of github.com:ipr-sr2/setup into hydro_migration
Merge pull request #2 from ipr-sr2/hydro_migration

Hydro migration