updates to sprite light
Merge remote-tracking branch 'origin/master'

Conflicts:
	sprite-light.pro
	sprite-light.pro.user