Merge remote-tracking branch 'origin/master'

datasets/aud1.json

editor/editor.html

editor/images/tools/addnode.png

editor/images/tools/collect.png

editor/images/tools/connect.png

editor/images/tools/delete.png

editor/images/tools/select.png

editor/js/display.js

editor/js/editor.js

editor/js/graph.js

editor/js/state.js

editor/js/tools/addnodetool.js

editor/js/tools/collecttool.js

editor/js/tools/connecttool.js

editor/js/tools/deletetool.js

editor/js/tools/selecttool.js

editor/js/tools/tool.js

graph.js

knowledge-space.php