minor update
Merge branch 'master' of https://github.com/daniel-zhang/render_demos

Conflicts:
	RenderEngine2/Widget.h