修改storyboard

修改storyboard
Merge branch 'master' of https://github.com/xrj277427509/SmartBattery

Conflicts:
	SmartBattery.xcodeproj/project.pbxproj