#2309
Highcharts
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://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 https://github.com/molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
added submenu, fixed top menu (with new styling)
Merge pull request #999 from RoanKanninga/master

added submenu, fixed top menu (with new styling)
changed color of menu bar
index root protocols as well as datasets in datasetIndexer
Merge pull request #1000 from RoanKanninga/master

changed color of menu bar + made topbar fixed
rename indexprotocol to plural: indexprotocols
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #1001 from bartcharbon/master

index root protocols as well as datasets in datasetIndexer
small edit in header
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #1002 from RoanKanninga/master

small edit in header
#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