update
update
Merge branch 'master' of https://github.com/Jargendas/Homemote2

Conflicts:

Homemote.xcodeproj/project.xcworkspace/xcuserdata/Jonathan.xcuserdatad/U
serInterfaceState.xcuserstate