Merge origin/master

Conflicts:
	src/hivemind/Hivemind.java
	src/hivemind/Population.java
Merge origin/master

Conflicts:
	src/hivemind/Hivemind.java
	src/hivemind/Population.java