解决键盘某些情况隐藏导致视图不跟着移动的问题
Merge branch 'master' of https://github.com/SiteView/SmartWifiForIOS

Conflicts:
	SmartWifiForiPhoneiPod/SmartWifi/SmartWifi/SmartWifiViewController.m