Modify diff for feature-scheduler branch
Merge branch 'master' of https://github.com/trillek-team/trillek-assets

Conflicts:
	diffs/develop-bob_lamp.diff
shader load json
Merge branch master of trillek-assets into graphics
Merge branch 'master' of trillek-assets into graphics

Conflicts:
	tests/sample.json
Merge branch 'master' of trillek-assets into graphics
Added normal calculation for animated objects, transparent black is discarded

This was tested this time...
forgot to add the simple shading back, added a light component
Alpha adds shadeless-ness, added render configuration in json
More test shaders and pipeline with lighting rendered
Deferred shading shaders and render config, and some test lights
settable light radius and colors for the lights
Merge branch 'graphics' of https://github.com/Meisaka/trillek-assets