Merge branch 'master' of ssh://git.house:/usr/local/git/base/kiosk