Merge branch 'oe4.2' of git://github.com/openelisglobal/openelisglobal-core into develop

* 'oe4.2' of git://github.com/openelisglobal/openelisglobal-core:
Bug fix -- patient report by subject number was broken.  Uped build to 4.2.1

https://www.pivotaltracker.com/story/show/81608074
Merge branch 'oe4.2' into develop

* oe4.2:
  Bug fix -- patient report by subject number was broken.  Uped build to 4.2.1

Conflicts:
	app/src/build.properties
Merge pull request #403 from pfschwartz/develop

Merge fix from 4.2.1 which corrected GSOD when generating report by patient subject number