Better fix for #3299
--- Highcharts 4.0.4 / Highstock 2.0.4 / Highmaps 1.0.4 official release ---
Cleaned up
Some markdown formatting in readme
As previous
Merge remote-tracking branch 'upstream/master'

Conflicts:
	exporting-server/java/highcharts-export/highcharts-export-convert/src/main/resources/phantomjs/heatmap.js
	exporting-server/java/highcharts-export/highcharts-export-convert/src/main/resources/phantomjs/highcharts-3d.js
	exporting-server/java/highcharts-export/highcharts-export-convert/src/main/resources/phantomjs/highcharts-more.js
	exporting-server/java/highcharts-export/highcharts-export-convert/src/main/resources/phantomjs/highcharts.js
	exporting-server/java/highcharts-export/highcharts-export-convert/src/main/resources/phantomjs/highstock.js
	exporting-server/java/highcharts-export/highcharts-export-convert/src/main/resources/phantomjs/no-data-to-display.js
	exporting-server/java/highcharts-export/highcharts-export-convert/src/main/resources/phantomjs/solid-gauge.js
	exporting-server/phantomjs/heatmap.js
	exporting-server/phantomjs/highcharts-3d.js
	exporting-server/phantomjs/highcharts-more.js
	exporting-server/phantomjs/highcharts.js
	exporting-server/phantomjs/highstock.js
	exporting-server/phantomjs/no-data-to-display.js
	exporting-server/phantomjs/solid-gauge.js