Added Separate Server Controller
Merge branch 'my-Copy'

Conflicts:

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