Check the diff
Merge branch 'newUI' of github.com:jcgharvey/vsm-drd into newUI

Conflicts:
	res/layout/activity_vital_stats_form.xml
	res/values/strings.xml
	src/se761/bestgroup/vsm/CountriesListDialogFragment.java