Julie's change added in
Merge branch 'master' of https://github.com/Putnameshere/EarthStation

Conflicts:
	controllers/ui.js
	services/pixijs.js
	services/threejs.js
	templates/EarthStation.html