add spaceship model
Merge branch 'master' of https://github.com/qvoiriot/solarsystem_education

Conflicts:
	assets/js/main.js
Merge branch 'master' of https://github.com/qvoiriot/solarsystem_education

Conflicts:
	systeme_solaire.html