rebasing after shutdown of machine
Merge branch 'sphere' of github.com:PascalSteger/darcoda into sphere

Conflicts:
	gravlite/programs/plotting/gl_collection.py