camsys/oneclick — pull request #10 by quinn (2014-07-17 22:09:17+00:00)
Title: fixing issues with merge

Here are various fixes for regressions we found in the kiosk after the merge.