update to Xcode6
Merge remote-tracking branch 'origin/Site_Alert' into Site_Alert
site pick function adjust