Initial commit on specifying root
Finish support for pruning
Handle when input doesn't exist for a triples map
Merge branch 'development' of https://github.com/InformationIntegrationGroup/Web-Karma into development
Redesigned MergeJSON
Updated merge.sql
fix glue problem, essentially a history problem
another small bug
Create HNode if it does not exist when applying history
Fix performance issue for unfold
New JSONObject collectors
Accept multiple path
return empty string
WK-336 @comment constant nodes behave as object properties if URI and data properties if not.
Issues on Undo/Redo commands
WK-342 @comment Make SetMetaPropertyCommand backward compatible
WK-297 @comment Have the entity extraction JAR in a rep on colo-vm41
Merge branch 'development' into new_model_layout

Conflicts:

karma-commands/commands-common/src/main/java/edu/isi/karma/controller/up
date/AlignmentSVGVisualizationUpdate.java
	karma-web/src/main/webapp/js/d3-alignment-vis.js
remove sourceMappingURL=jquery-1.10.2.min.map
labels for edgeLinks