CEP - simplify names
Merge branch 'HEAD' of git@github.com:Heigvd/Wegas.git into pmg
Added assignement test
Refactored resourceinstance history and added test