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
SVG parser now finds all elements and can annotate them.
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
Merge branch 'master' of https://github.com/molgenis/molgenis

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
- re-added tooltips, rows selectable
improved code
code improvement: open writer in same method as where it is closed
Merge branch 'master' of https://github.com/molgenis/molgenis
Added xLabel, yLabel to Chart, and scale to HeatMapChart.
Added an Enum for the scale type (can be ROW, COL, NONE)
Removed one more system.out in SVGEditor
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #994 from bartcharbon/master

fix build - add new module (data-omx) to parent pom
New heatmap function, combining heatmap.plus and heatmap.2