Added Scroll view to the necessary views
Saving Results
Merge branch 'master' of github.com:nodnarb/conservo

Conflicts:
	android-client/src/com/disrupt/conservo/InsideWaterUseActivity.java
	android-client/src/com/disrupt/conservo/OutsideWaterUseActivity.java
	android-client/src/com/disrupt/conservo/WaterAuditActivity.java