Updated to current master version for the game jam lighting branch

use this branch for the lighting branch during the game jam