TRUNK-3781: Support a mechanism for modules to execute code with elevated privileges
(cherry picked from commit b9b88eb6ef6859ea1ae91622b1283b3d595515f6)

Conflicts:

	api/src/main/java/org/openmrs/api/context/Daemon.java
TRUNK-3706: Installation assistant not showing correct encoding
(cherry picked from commit 30d626774d43d07f6867908a5539e9414b6a3cb2)
TRUNK-3706, follow up fix for NPE
(cherry picked from commit c55a44b6918caeb2e32f21c35e1d9040a4f2f9fc)
TRUNK-3830: Ignore OpenMRS files in git
TRUNK-3725:Add purge method to ActiveListService
(cherry picked from commit f6d1c190fc614236e7c2d6a8037ff6e709dbfccd)
Fixed formatting
TRUNK-3491: Write to independent log file
TRUNK-2999: Changed index locking strategy
Merge branch '1.9.x' of https://github.com/openmrs/openmrs-core into 1.9.x
proposed concept queue - proposed concept text did not get saved to dictionary correctly

Follow to ensure we dont add the proposal several times - TRUNK-3593

Fixed issues where the synonym and other data dont get saved -
TRUNK-3593

Follow up to get make sure duplicate synonyms and obs are not created -
TRUNK-3593

Made some minor fixes due to merge errors - TRUNK-3593

Improved the alert message when a synonym is added - TRUNK-3593
Follow up to reject proposals with the matching text - TRUNK-3593
Fixed failing unit test - TRUNK-3593

Fixed failing unit test - TRUNK-3593
Fixed ConceptProposalFormControllerTest to extend
BaseWebContextSensitivetest - TRUNK-3593
TRUNK-3832: Add proximity search for Concepts
TRUNK-3832: Lowered boost
TRUNK-3838: Boost phrase search to rank exact matches higher
Merge branch 'master' of https://github.com/openmrs/openmrs-core into hibernate-search
TRUNK-2511: When creating a new patient, pre-populate the "Identifier Type" field
TRUNK-2511: Added missing file
TRUNK-2511: Corrected ordering