Merge remote-tracking branch 'origin/autoheli-dev' into autoheli-dev

Conflicts:
	simbeeotic-testbed/src/main/java/harvard/robobees/simbeeotic/model/AutoHeliBee.java
	simbeeotic-testbed/src/main/java/harvard/robobees/simbeeotic/model/BaseAutoHeliBehavior.java