fixed
Merge branch 'master' of https://github.com/kylejao/ocean_framework

Conflicts:
	ocean/util/IperfTest.java
v1.0