added default serialVersionUID
Merge branch 'master' of github.com:jcgharvey/vsm-drd into tests
Made tests actually compile
added more tests
Added some tests, made them all go green
Merge branch 'master' into tests
Added positive tests for height, weight and name. Added test cases for Occupation and NHI Number
Added more tests for occupation and nhinumber
Made the occupation and nhinumber tests green
DOB and Gender tests
added familyHistoryLabel and medicalConditionsLabel
icons
added icons and made corresponding changes in manifest
Merge branch 'tests' into icons
Merge branch 'icons'

Conflicts:
	.gitignore
	AndroidManifest.xml
	res/values/strings.xml