cleaned resources, added basic shaders and updated scene loader
scene update, loader fix, merge fix