Merge branches '3D-swarm-sim' and 'leader_coating' of gitlab.cs.uni-duesseldorf.de:cheraghi/swarm-sim into leader_coating

Conflicts:
	grids/TriangularGrid.py