Rename DataWrapper to NetworkData

+ Manifest cleanup
Merge branch 'master' of https://github.com/ippes/Hive2Hive.git into versioning
Extract Waiter to own class