TRUNK-3943: Support data preserve on browser back button in concept search page
Merge branch 'master' of https://github.com/openmrs/openmrs-core
Merge branch 'master' of https://github.com/openmrs/openmrs-core
OpenMRS crashes irrecoverably if particular errors occur during module loading  - TRUNK-2850
get folder for module web files programatically - TRUNK-1589

Made some changes - TRUNK-1589

Made more changes to the tests - TRUNK-1589

Applied auto format changes - TRUNK-1589
Made changes to throw an exception if the dispatcher servlet is null - TRUNK-1589

Fixed javadoc - TRUNK-1589
Taken care of trailing slash depending on if it is included or not which depends on the servlet container's Implementation of ServletContext.getRealPath - TRUNK-1859
Made minor change to getModuleWebFolder - TRUNK-1589
Replaced / with File.separator when fetching module web folder - TRUNK-1859
TRUNK-3980: Add back button support for patient search page
NonUniqueObjectException: a different object with the same identifier
value was already associated with the session: [org.openmrs.Patient#] -
TRUNK-3728

Applying auto format changes - TRUNK-3728
Applying auto format changes
TRUNK-3979: LoggingAdvice should also log which user is performing an action when an error occurs

Null check and taking systemId if username is empty

User null check

Fix of code duplication
Search for patient by identifier fails when identifier is made of only
letters - TRUNK-3822

Follow up - TRUNK-3822

Follow up to fix some issues - TRUNK-3822

Fixed patientService.getPatientCount method - TRUNK-3822

Follow up to fix failing unit test - TRUNK-3822

Apply auto format changes and fixed HibernateEncounterDAO - TRUNK-3822
fixes to trunk 3991
Merge branch 'master' of https://github.com/openmrs/openmrs-core
Merge pull request #316 from surangak/TRUNK-3991

fixes to trunk 3991
Merge pull request #311 from wluyima/TRUNK-2850

OpenMRS crashes irrecoverably if particular errors occur during module loading  - TRUNK-2850
Merge branch 'master' of https://github.com/openmrs/openmrs-core
Merge pull request #315 from bhashitha/TRUNK-3980

TRUNK-3980: Add back button support for patient search page