[ProtocolManager] add contact when is disconnected
[Proto] added file transfer in protocol
Merge branch 'master' of github.com:melodron/linpop

Conflicts:
	protocolmanager.cpp