conflicts remaining on shiny "ui" and "server"

Merge branch 'thierry'

# Conflicts:
#	inst/ShinyApp/server.R
#	inst/ShinyApp/ui.R