Issue with some ContactPerson elements

Found an issue in the nefed document (download link) where some ContactPerson entities have their names stored in a Company child element instead of the expected GivenName child element. This causes App.java to point to incorrect GivenName fields and eventually throw a NullPointerException. These issues in the nefed document need to be corrected for the metadata parser to work. Attached is an example of this occurring.