Start introducing the new config in arx/main
Merge branch 'master' of https://github.com/arx-deidentifier/arx.git
into flexible-config

Conflicts:
	src/main/org/deidentifier/arx/ARXAnonymizer.java