Merge branch 'master' of https://github.com/loiu92/DomHome

Conflicts:
Application
iPhone/DomHome.xcodeproj/project.xcworkspace/xcuserdata/Loiu92.xcuserdat
ad/UserInterfaceState.xcuserstate
test
test