link labels
Merge branch 'master' of github.com:stucco/ontology-modifier

Conflicts:
	app/index.html
	app/scripts/views/ontologyText.js
	app/scripts/views/ontologyVis.js