asdfsfxvc
Merge branch 'master' of https://github.com/globalelectric/ZZ

Conflicts:

Hangbit/Hangbit.xcodeproj/project.xcworkspace/xcuserdata/ipatient.xcuser
datad/UserInterfaceState.xcuserstate