tested version, finished but for core issue with disabling contact type
adding Custom Groups and Fields via XML
Merge branch 'master' of https://github.com/PUMNL/nl.pum.generic

Conflicts:
	generic.php