test
Merge branch 'master' of https://github.com/NeilSoul/GroupTV

Conflicts:
	GroupTV.xcodeproj/project.pbxproj

GroupTV.xcodeproj/project.xcworkspace/xcuserdata/medialab.xcuserdatad/Us
erInterfaceState.xcuserstate

GroupTV.xcodeproj/project.xcworkspace/xcuserdata/root.xcuserdatad/UserIn
terfaceState.xcuserstate
	GroupTV/NetSDK/config.h