Merge branch 'notation' of https://github.com/neustar/xdi-grapheditor into notation

Conflicts:
	public_html/js/XDI_graph_editor_model.js