added rendering of the lamp
merge
merge
Merge branch 'master' of https://github.com/vcrom/XVR_Project

Conflicts:
	XVR_Project/XVR_Project/XVR_Project.s3d