Updated to STIX 1.1 version of STIX to HTML
Added icons for "grouping" nodes
Adding warning for opening a node with more than 10 child nodes
Merge branch 'tl-development' of https://github.com/STIXProject/stix-viz into tl-development
Merged with jcanadas latest changes
Recovering filtering for timeline
updating java
cheanges from STIX meeting
Merge branch 'tl-development' of https://github.com/STIXProject/stix-viz into tl-development
Merge remote-tracking branch 'origin/tl-development' into filtering

Conflicts:
	src/nodejs/bin/java.exe
	src/nodejs/public/js/STIXRelationshipGraph.js
	src/nodejs/public/js/STIXTimelineJson.js
	src/nodejs/public/js/StixViz.js
Increased the threshold for warning about expanding to 20 children