Added attributes on ShopOption
Merge branch 'master' of https://github.com/Statkraft/HydroPowerModelSimulation
harmonising progress tests