#2309
Highcharts
Merge branch 'master' of github.com:molgenis/molgenis
#2211
The basic implementation for using Highcharts and Highstock charts.
This code is for presentation purposes because it is not yet fully
implemented.
Merge branch 'master' of github.com:molgenis/molgenis
#2211
#2211
Merge branch 'master' of github.com:molgenis/molgenis

Conflicts:
	molgenis-charts/src/main/java/org/molgenis/charts/AbstractChart.java
	molgenis-charts/src/main/java/org/molgenis/charts/ChartController.java
	molgenis-charts/src/main/java/org/molgenis/charts/requests/ChartRequest.java
	molgenis-charts/src/main/java/org/molgenis/charts/requests/HeatMapRequest.java
	molgenis-r/src/main/java/org/molgenis/r/MolgenisRException.java
#2211
Merge pull request #996 from jjettenn/master

#2211 As Triumph user I want to design search/visualization tools
Merge branch 'master' of https://github.com/molgenis/molgenis