Fixed TPNav bug and CPTExtras bug, updated language
Merge remote-tracking branch 'origin/develop'