Merged braches and fixed texture mapping.

Texture mapping is now done per body. A separate texture can be assigned
per proxy and per body in Universe.cpp.