TRUNK-4055 Substitute deprecated Hibernate.* fields
wrapping unescaped ${statement} outputs in <c:out ... /> jsp tags to conquer XSS
Merge pull request #443 from dedunumax/TRUNK-4055

TRUNK-4055 Substitute deprecated Hibernate.* fields
wraps usage of patientIdentifier in <c:out ...>
Merge pull request #447 from MrMarvin/fixing-TRUNK-3931

TRUNK-3931 wrapping unescaped ${statement} outputs in <c:out ... />
Fixing problem where some test was passing when run in eclipse but
failing when run at command line - TRUNK-4134
Merge branch 'master' of https://github.com/openmrs/openmrs-core
Cleaning up ModuleActivatorTest and adding license header
some formatting for the ModuleActivatorTest
Increasing the version of maven-surefire-plugin for better commandline
reporting
Reverting to the old version of maven-surefire-plugin because of some
unit test failures
Adding classes that support testing module activator methods that
require refreshing of the spring application context - TRUNK-4134
Improving comments in module activator unit tests - TRUNK-4134
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Improving comments in module activator unit tests - TRUNK-4134
  Adding classes that support testing module activator methods that require refreshing of the spring application context - TRUNK-4134
  Reverting to the old version of maven-surefire-plugin because of some unit test failures
  Increasing the version of maven-surefire-plugin for better commandline reporting
  some formatting for the ModuleActivatorTest
  Cleaning up ModuleActivatorTest and adding license header
  Fixing problem where some test was passing when run in eclipse but failing when run at command line - TRUNK-4134
  wraps usage of patientIdentifier in <c:out ...>
  wrapping unescaped ${statement} outputs in <c:out ... /> jsp tags to conquer XSS
  TRUNK-4055 Substitute deprecated Hibernate.* fields