(mostly) complete river data class
river data collection and processing - initial version
updated manifest and layouts
Merge branch 'master' of https://github.com/QuasimodoNZ/Bluno-WaiNZ

Conflicts:
	BlunoBasicDemo/src/com/example/blunobasicdemo/RiverHealthCalculator.java
Fixed some dumb mistakes
Merge branches 'master' and 'master' of https://github.com/QuasimodoNZ/Bluno-WaiNZ
Removing an error message
Merge branch 'master' into development

Conflicts:
	BlunoBasicDemo/res/values/strings.xml
	BlunoBasicDemo/src/com/example/blunobasicdemo/MainActivity.java