update
Merge remote-tracking branch 'origin/master'

Conflicts:
	shiny/server.R
	shiny/ui.R