prepare merge
;;Merge branch 'master' of https://github.com/jspdown/Plazza-manu-harold-tom

Conflicts:
	src/CompetitiveAccessAbstraction/UnixProcess.cpp
plop