Restructured the graphics part
Merge remote-tracking branch 'origin/master'

Conflicts:
	editor/render_view.cpp