Change both the more results labels on the results page to be more meaningful
patient view multi-tenancy deployed

Conflicts:
	patientview/src/main/webapp/body/patient/results.jsp
Merge pull request #11 from robworth/release

Release - ie7 and change password work
Merge pull request #13 from robworth/release

Released 25/03/2013
BUGFIX: Add some extra logging to the XML Importer.  Only report on the first 20 errors in a file.  Truncate the log entry extrainfo column to fit a TEXT column.
Merge remote-tracking branch 'origin/release'

Conflicts:
	patientview/src/main/java/com/worthsoln/patientview/XmlImportUtils.java
Merge remote-tracking branch 'origin/release'

Conflicts:
	patientview/src/main/java/com/worthsoln/patientview/XmlImportUtils.java
Merge remote-tracking branch 'robworth/develop' into develop

Conflicts:
	patientview/src/main/webapp/body/patient/results.jsp
Merge develop barnch
Revert the commit of "Merge develop branch"

Revert the commit of "Merge develop branch"
Merge to single repository (develop)

Merge from shinetechs/features/100-Upgrade-Jquery to new branch
"features/100-Upgrade-Jquery" (develop)
Merge pull request #28 from richardli5945/features/100-Upgrade-Jquery

Features/100 upgrade jquery