Change to Server and Core script
Change to Highchart script
Merge branch 'master' of Luma

Conflicts:
	public/index.html