updated manifest and layouts
Merge branch 'master' of https://github.com/QuasimodoNZ/Bluno-WaiNZ

Conflicts:
	BlunoBasicDemo/src/com/example/blunobasicdemo/RiverHealthCalculator.java