Modal has been brought into existence, fully
Merge branch 'convergence' of github.com:robwhitaker/DiagramAlley into convergence

Conflicts:
	js/Edit.js