Propertygroup i  ext1

Lager en konflikt
Merge branch 'master' of https://github.com/EDRMedeso/Test1

Conflicts:
	Extensions/ext1.xml