moved iterators from Python to C++ for GetDistCpp.py
Merge remote branch 'upstream/master'

Conflicts:
	app/cppbfs/GetDistCpp.py