Lots of new changes
Blah
Merge branch 'master' of https://github.com/spenciefy/Automate

Conflicts:

Automate/Automate.xcodeproj/project.xcworkspace/xcuserdata/shalinvs.xcus
erdatad/UserInterfaceState.xcuserstate
Blha