Fixed typo in Grandard's bar description
Merge branch 'master' of https://bitbucket.org/avihay/naev into mb
Merge branch 'master' of https://github.com/BTAxis/naev
* Moved Thurion ship gfx data into its proper location.