gestao de conflitos e continuacao do PIDir
Merge branch 'master' of https://github.com/TiagoSerip/RCM.git