Add more material related code
Merge branch 'master' of https://github.com/WangHoi/elune

Conflicts:
	include/types.h