none
don't know
Merge branch 'master' of https://github.com/rkyouth/HiShow into Chard

Conflicts:
	hishow.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/rkyouth/HiShow into Chard

Conflicts:
	hishow.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
//
Merge branch 'master' of https://github.com/rkyouth/HiShow into Chard

Conflicts:
	hishow.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/rkyouth/HiShow into Chard