Merge branch 'master' of https://github.com/highslide-software/highstock-release

Conflicts:
	highstock.js
	highstock.src.js