Default cockpit
bump
slight include cleanup
tiny cleanup prep for next commit
add pioneer decal to station and cargo models. #2680
add manufacturer decals to ships. #2680
bump
Merge remote-tracking branch 'nozmajner/default_cockpit'
fix shadowed param warning
Merge pull request #38 from pioneerspacesim/master

Sync to master