added ipmanager
solution update
feature 3 stuff
Merge branch 'master' into feature3

Conflicts:
	Tester.v11.suo
	Tester/obj/Debug/Tester.csproj.FileListAbsolute.txt