merge shinyapp into documentation_work

grab updated shinyapp branch changes into documentation branch