Fix bug: ADD:CLASSSKILL in sub class throws error
* Fix restore of choice on character load
Issue#: CODE-2201


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