Merge pull request #120 from vincent-lhote/master

DATA-2105

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@25329 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Merge pull request #121 from mjmeans/pfs

PFS & ACG updates

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@25330 ef53c05b-3124-4d59-ae7d-fe3273f42be7