Merge branch 'master' of https://github.com/MGrin/p2p-mapreduce

Conflicts:
	src/ch/epfl/p2pmapreduce/nodeCore/network/ConnectionManager.java
	src/ch/epfl/p2pmapreduce/nodeCore/peer/Peer.java