TRUNK-2312: nav menu expand
TRUNK-2312: Fixing the left edge overlapping of the OpenMRS text logo
modifying surangas pull request accoring to comments on pull request 470
TRUNK-4166: Added check in BaseAttributeTypeValidator to prevent DatatypeConfiguration to be blank if Datatype is equal to Regex-Validated Text
TRUNK-4166 added junit test in BaseAttributeTypeValidatorTest
Ticket-2873:Improve wording for Testing option in installation wizard
TRUNK-3889. Pickup module resources from module api

Deprecate log4j setter/getter in Module
trunk-10:did not edit old messages,added new messages
Merge pull request #785 from aniketha/TRUNK_10

Trunk-10 Add page specific titles to jsp pages
TRUNK-4029: Hibernate config in parent pom.xml is outdated
Removed Hibernate search from parent pom since it's not used
Merge pull request #778 from NameFILIP/TRUNK-3889

TRUNK-3889. Pickup module resources from module api
TRUNK-3882 Custom tag to render errors

(cherry picked from commit be50e0dc73b33272bc01482ec59f1ff3bc6f1acb)

Conflicts:
	webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptStopWordForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/patients/mergePatientsForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/users/alertForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/users/changePasswordForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
	webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
	webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp
TRUNK-3926 updated messagecode to make it more readable
Merge pull request #797 from vaibhav-hp/Trunk-3926-new

TRUNK-3926 updated messagecode to make it more readable
cleaned Typographical error
Merge pull request #799 from vaibhav-hp/Trunk-3926-new

Trunk-3926 Cleaned Typographical error
TRUNK-3405 added function to create dwr-modules.xml in webmoduleUtil.java
+ added 2 unit tests in webModuleUtilTest.java

back to 745 - due to stashing

Added break statement on line 106 of webmoduleUtilTest.java

TRUNK-3405 - minor changes

TRUNK-3405 - removed unnecessary lines

TRUNK-3405 - added function getRealPath()
Merge pull request #789 from ujjwalarora/TRUNK-3405-a

TRUNK-3405 // Automated Error Report: ModuleException: dwr-modules.xml file doesn't exist.
Merge pull request #763 from akshika47/Trunk-2873

Ticket-2873:Improve wording for Testing option in installation wizard