ui
Merge branch 'master_2' into MEGAMAAAAN

Conflicts:
	src/config/manifest.js
	src/main.js
	src/nuclear/nuclear-render.js
	src/scenes/buildingManager.js
reeee