Added Server
Merge branch 'another-copy'

Conflicts:

proximity.xcodeproj/project.xcworkspace/xcuserdata/RAJESHGUPTA.xcuserdat
ad/UserInterfaceState.xcuserstate