Typo
Fixed heatmap annotation algorithm.
Merge branch 'master' of https://github.com/molgenis/molgenis
Added SVGEditor (empty at the moment) for annotating SVGs.
Updated the heatmap annotation algorithm in JQuery.
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
SVG parser now finds all elements and can annotate them.
Merge branch 'master' of https://github.com/molgenis/molgenis
#2309
Highcharts
Merge branch 'master' of github.com:molgenis/molgenis
SVGEditor now adds row and col attributes to heatmap elements.
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-charts/src/main/java/org/molgenis/charts/ChartController.java
	molgenis-charts/src/main/java/org/molgenis/charts/r/RChartService.java
Fix merge
small bug fixes + added scrollable modal
Merge pull request #985 from RoanKanninga/master

small bug fixes + added scrollable modal
fixed boolean and autocomplete bug
Merge pull request #986 from erwinwinder/master

Remove old QueryRule
fix for bug #920.
small formatting change
Merge pull request #987 from bartcharbon/master

fix for bug #920.