pull latest
Merge branch 'master' of https://github.com/icclowelondon/NeulastaGlobalNewSection
graphs update
Merge branch 'master' of https://github.com/icclowelondon/NeulastaGlobalNewSection

Conflicts:
	setup.js