Working on demo
Add tooltip
Remove comment
Move nodes over lines
Merge branch 'master' into local

Conflicts:
	default/data/ui/nav/default.xml
Change circles to rectangles
Merge branch 'master' into local
Fix issue with nodes moving
Merge branch 'master' into local