Adds upload capacity
Merge branch 'master' of github.com:wallstersson/peersim-cyclon

Conflicts:
	src/com/lajv/NodeWrapper.java
	src/com/lajv/cyclon/CyclonProtocol.java