Pre uni merge.
Merge branch 'master' of https://github.com/Wieke/bee-formation

Conflicts:
	source/bees/GordonBeeOccluded.py