GS-11422
edges rendering fixed, app module rendering fixed, root node rendering fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/services/layout.js
	app/scripts/services/render.js