bug fixed in affinity_data_provider
global rebalancing
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/front_end/data_provider/affinity_data_provider.hpp