rt demo updated
Merge branch 'master' of https://github.com/sergeyreznik/et-engine

Conflicts:
	demo/raytrace/Raytracer/MainController.cpp