worked out most of the views, need to add help and log out
Merge branches 'master' and 'master' of https://github.com/benon/discovery_kiosk