Working on search view
Merge branch 'Parse-User' into newmaster

Conflicts:

SidebarDemo/SidebarDemo.xcodeproj/project.xcworkspace/xcuserdata/shanesn
iteman.xcuserdatad/UserInterfaceState.xcuserstate