work mode for bees
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/Properties_Base.m