[MainScreen]一些修改
Merge branch 'master' of https://github.com/TimePie/TimePie

Conflicts:
	TimePie/TimePie.xcodeproj/project.xcworkspace/xcshareddata/TimePie.xccheckout