nothing
Merge branch 'master' of https://github.com/koocyton/KMConnect

Conflicts:

iFriends/ctTest.xcodeproj/project.xcworkspace/xcuserdata/Henry.xcuserdat
ad/UserInterfaceState.xcuserstate