Merge changes from master into Catina
Updated m8_content(seguretat).txt
Merge changes from Catina into master
Merge branch 'master' of https://www.penflip.com/miniops/m8_content-seguretat