removed warnings
integration

Conflicts:
	src/net/AbstractClient.java
	src/net/ClientPeer.java
	src/net/ServerPeer.java
	src/transfers/Transfer.java
Merge branch 'tema2' of https://github.com/evelinad/TemeIDP into tema2
and testing

Conflicts:
	src/transfers/Transfer.java