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