Test
test
Merge branch 'master' of https://github.com/N00D13/HomeMatic-Door-App

Conflicts:

HomeMatic-Door-App.xcodeproj/project.xcworkspace/xcuserdata/Alex.xcuserd
atad/UserInterfaceState.xcuserstate
	HomeMatic-Door-App/Parser.m