Merge commit '0c433f7' into gene_testing_2

Conflicts:
	erizo/src/erizo/NiceConnection.cpp
	erizo/src/erizo/OneToManyProcessor.cpp