Reorganized
Merge branch 'develop' of https://github.com/galaxy-team/galaxpy into develop

Conflicts:
	lib/jupiter
	lib/pluto
	lib/saturn