minor helptext change
Merge branch 'riverflyTest'
comment added
Merge branch 'riverflyTest'
Merge branch 'riverflyTest'
only sites with data displayed on map
Merge branch 'riverflyTest'
Merge branch 'riverflyTest'
Merge branch 'riverflyTest'
Merge pull request #2 from fozy81/riverflyTest

readme update
Merge branch 'riverflyTest'
Merge branch 'master' of https://github.com/fozy81/Riverfly
Merge branch 'riverflyTest'
conflicts

Merge branch 'riverflyTest'

Conflicts:
	ui.R
conflicts foxed
add url.js
delete url.js
url link and graph changes

Merge branch 'riverflyTest'

Conflicts:
	ui.R
Merge branch 'riverflyTest'
conflicts