RA-144: better id's
Merge branch 'master' of https://github.com/openmrs/openmrs-distro-referenceapplication
RA-144: replace xpath/css expressions with id's