added left out validations
UAT defect fixes
Merge branch 'master' of https://github.com/spkhillar/field-app

Conflicts:
	telenoetica.field.service.app.android/res/values/strings.xml