more merge resolved
Merge branch 'master' of https://github.com/ThesisDistributedProduction/Raport