Merge pull request #131 from mjmeans/DATA-2117

DATA-2117

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

PFS updates for Paizo PFS Additional Resources Guide, October 1, 2014

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