Typos, consistency fixes and more descriptions for assets beginning with B
A new exterior image for D class planets, moons and asteroids (particularly uninhabited ones) - courtesy of the methane.png\!
Merge branch 'astroidexterior' of https://github.com/PhoenixRiver/naev into astroidexterior
Typos etc. for assets beginning with C plus a small rewrite for brock that was bugging me
More typos and consistency fixes...
* Fixed improper planet graphic assignment.
Merge remote-tracking branch 'upstream/master'
Merge branch 'astroidexterior' of https://github.com/PhoenixRiver/naev into tmp
Merge branch 'typos_C' of https://github.com/PhoenixRiver/naev into tmp

Conflicts:
	dat/assets/brock.xml
* Fixed absorbed for thurion ship.
Merge branch 'typos_D' of https://github.com/PhoenixRiver/naev into tmp
* Two new planets by Andmiw.
* Four new planets by Andmiw.
commiting more changes, made zalek dark red cause it fit better than purple
merge conflict i think
madding more crap complicated by merge conflicts, i am a tool
I hate merge conflicts