kites with uniform buffers
Merge remote-tracking branch 'origin/uniform_buffers' into uniform_buffers

Conflicts:
	src/main/java/bio/organisms/SimpleCircleOrganism.java