discover view update
Merge branch 'master' of https://github.com/popsup/popsup