Wavefront OBJ model loading support and bugfixes
Resolved conflict.