A couple of trivial fixes
Change a couple of labels for master version
Change title
Minor bug fixes
Merge branch 'master' into development

Conflicts:
	server.R
	ui.R

Merge development into master