Fixes to Guitar Pro 4 and 5 implementations.
Merge pull request #1176 from jpirie/guitar-pro-import

Fixes to Guitar Pro 4 and 5 implementations.