Added the wizard for links
Merging and adding more functionality with wizard

Conflicts:
	gui/CanvasController.py