Merge pull request #3 from BahamutDragon/master

Feature - Augmented Subtype to now display when base race type is change...

https://github.com/pcgen/pcgen/commit/d18d69f
Merge pull request #5 from mjmeans/master

add faction names to faction prestige awards

https://github.com/pcgen/pcgen/commit/e46beb7
Merge branch 'master' of github.com:PCGen/pcgen

https://github.com/pcgen/pcgen/commit/3c92702
Merge pull requests

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

https://github.com/pcgen/pcgen/commit/054ed6e