Edit strings to better comply with STS (refactored IDs too)
Merge branch 'datassis2phat4me' of https://github.com/Proplex/Antox into Proplex-datassis2phat4me
Merge branch 'Proplex-datassis2phat4me'