Merge pull request #1 from aodendaal/master

Project metadata clean up, terrain painting and updated cockpit models.
Merge remote-tracking branch 'upstream/master'