some small bugs and working on the new data model
Merge branch 'master' of https://github.com/benon/discovery_kiosk