Follow up to use SimpleDateFormat instead of Calendar object in unit tests  - TRUNK-4472
TRUNK-4026: Locking OpenMRS API level not to show various content items
TRUNK-4426 Search widget should find concepts by mappings
TRUNK-4426 Reverting unrelated change to the search
Trunk-4444 Validate order overlap with scheduled date

Trunk-4444 Implementing feedback on earlier commit

Trunk-4444 Adding void order check while checking overlapping schedule of orders

Trunk-4444 Moving checkoverlap method to OrderUtil
Follow up to ensure that orders that start or end on dates equal to other orders' start and end are considered to be overlapping  - TRUNK-4444

Follow up to ensure that orders that start or end on dates equal to other orders' start and end are considered to be overlapping  - TRUNK-4444
Merge pull request #1018 from rpuzdrowski/TRUNK-4026

TRUNK-4026: Locking OpenMRS API level not to show various content items
Allow implementations to control whether drug orders require formulation TRUNK-4440

Follow up to address review comments  - TRUNK-4440
TRUNK-2894: Renamed a few messages as requested
Cleaned up javadocs, code in Order, DrugOrder classes and corrected typo in test data file name

Cleaned up javadocs, code in Order, DrugOrder classes and corrected typo in test data file name

Cleaned up javadocs, code in Order, DrugOrder classes and corrected typo in test data file name
Upgraded jackson api version to 1.9.13 - TRUNK-3978
Support deriving auto_expire_date from duration and duration units for Drug Orders - TRUNK-4446

TRUNK-4446: Infer drug order auto expire date based on duration and frequency

TRUNK-4446: Use uuid for comparision. Improved javadoc for ISO8601Duration

TRUNK-4446: Changes based on PR comments

* Remove unused constants in map type
* Use uuid of concept source
* Exception when duration code is unknown
* Exception when frequency not provide for recurring interval
* Fix uuid, dates in change set.
* New change set for alter column
* Check for duration and units before infering expire date
* Use getEffectiveStartDate to handle scheduled order

TRUNK-4446: Add preconditions for inserting concept source and reference terms

TRUNK-4446: Move migrations from liquibase-core-data.xml to liquibase-update-to-latest.xml

TRUNK-4446: Validate duration units is mapped to ISO 8601 duration when auto expire date is not set

Follow up to remove concept map uuid restriction and moved logic that checks for durations mappings to DrugOrderValidator - TRUNK-4446

Follow up to fix failing tests - TRUNK-4446
Follow up to fix failing upgrade tests - TRUNK-4446
TRUNK-4441 Migrate getDrugs to use LuceneQuery
Merge pull request #1022 from geoff-wasilwa/TRUNK-2894

TRUNK-2894: Renamed a few messages as requested
TRUNK-4020: AddressTemplate should let a user specify required fields
TRUNK-2894: Change all void references to delete in interface
TRUNK-4484 - fixed administration instructions for SimpleDosingInstructions
Merge pull request #1034 from pmuchowski/TRUNK-2894

TRUNK-2894: Change all void references to delete in interface
TRUNK-4238 OpenmrsUtil.storeProperties should escape backslashes