resource system improvement
Merge branch 'master' of github.com:Lolilolight/SFGL

Conflicts:
	license.txt