Also auto select Location and Individual if only one entry available
Merge branch 'master' of github.com:SwissTPH/openhds-tablet

Conflicts:
	src/main/java/org/openhds/mobile/activity/UpdateActivity.java