Small fixes and archetype removal

1. Added Perform (Wind) to the Skald class skills as per the new Paizo official FAQ issuing errata on its omission.

2. Replaced Combat Style I as a prequeresite for Combat Style III for Combat Style II.
Jenkins fix
Merge branch 'master' of https://github.com/sloppyalien/PCGEN
Merge branch 'master' of https://github.com/sloppyalien/PCGEN
Remove empty 4e folder

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@25213 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Close Weapon Mastery and Martial Training

Martial Training only coded at 50%
Martial Training and Close Weapon Mastery

Martial Training is at 50%
Martial Training and Close Weapon Mastery

Martial Training is at 50%
Removed a couple superfluous Special Attack tags.
Merge pull request #78 from mjmeans/pfs

Jenkins fix

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@25214 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Merge pull request #80 from SecretWizard/patch-11

Close Weapon Mastery and Martial Training

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@25215 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Merge pull request #71 from SecretWizard/patch-5

Small fixes and archetype removal

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@25216 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Merge branch 'master' of https://github.com/sloppyalien/PCGEN
Merge remote-tracking branch 'upstream/master'