Fixed typo in Grandard's bar description
Merge branch 'master' of https://bitbucket.org/avihay/naev into mb
Merge branch 'upstream/master'