Fixed Type of type_ property in PEResource; it should have used the String class as its base type
Merge branch 'master' of github.com:CybOXProject/python-cybox