added popovers
Merge branch 'master' into gh-pages
fixed testing
Merge branch 'master' into gh-pages