Merge pull request #1071 from ghost1227/master

Proposed change to CPTs to better define plural names.
Fix for svg 404 bug