[rend2] Fixing the image loader. Made a batch script to create .cpp for the glsl shaders. Still have to manually merge the files.
Some other conflicts resolved.