Merge commit '7cd0520d157e26049803b46ec7840ea12d7fa0dd'

Conflicts:
	lib/systemc_helpers/sc_map/sc_map_base.hpp
	lib/systemc_helpers/sc_map/sc_map_iter_square.hpp
	lib/systemc_helpers/sc_map/sc_map_iterator.hpp