Merge Aaron's latest.
Move kiosk javascripts back under includes/.