added NGTests for HighchartService.java
Adding tests to the charts code
Merge branch 'master' of github.com:molgenis/molgenis
fixed the major bugs
Merge branch 'master' of https://github.com/molgenis/molgenis
Automated Merge from master
delete data/metadata in one transaction, make deleting data set entity part of data delete
Delete OmxStandAloneTest, should not have been commited
Merge pull request #1086 from erwinwinder/master

Delete OmxStandAloneTest, should not have been commited
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #1084 from RoanKanninga/master

fixed the rollback metadata + better information what is imported and how many
Merge pull request #1085 from dennishendriksen/master

Delete data/metadata in one transaction, make deleting data set entity p...
Merge branch 'master' of github.com:molgenis/molgenis
Enable uload of app logo
issue #609
FindBug bugfix: 

Found reliance on default encoding in
org.molgenis.charts.r.RChartService.generateScript(String, Map, String):
new java.io.FileWriter(File)

Found a call to a method which will perform a byte to String (or String
to byte) conversion, and will assume that the default platform encoding
is suitable. This will cause the application behaviour to vary between
platforms. Use an alternative API and specify a charset name or Charset
object explicitly.
Findbugs bugfixen

Fix 1:
SVGEditor.java:212
Exception is caught when Exception is not thrown in
org.molgenis.charts.svg.SVGEditor.annotateHeatMap(HeatMapChart)

Fix 2 and 3:
SVGEditor.java:110, SVGEditor.java:107
org.molgenis.charts.svg.SVGEditor.annotateHeatMap(HeatMapChart) may fail
to clean up java.io.InputStream
Merge pull request #1088 from erwinwinder/master

Enable uload of app logo
Fix spinner image not shown in importer.
issue #863
close streams, check is delete was succesfull
Merge pull request #1089 from erwinwinder/master

Fix spinner image not shown in importer.