center + test highlight
Merge branch 'master' into ISOTIBO

Conflicts:
	src/nuclear/nuclear-render.js
	src/scenes/gridGenerator.js
fix,merge