继续提交
Merge branch 'master' of https://github.com/SiteView/SmartWifiForIOS

Conflicts:

SmartWifiForiPhoneiPod/SmartWifi/SmartWifi.xcodeproj/project.xcworkspace
/xcuserdata/siteview_mac.xcuserdatad/UserInterfaceState.xcuserstate