TRUNK-3463 - quantityUnits fieldGen type to String
TRUNK-3463 - putting the BOM back in
TRUNK-3463 - putting the BOM correctly in
Merge pull request #22 from sunbiz/TRUNK-3463

Edit drugorder fails
https://tickets.openmrs.org/browse/TRUNK-3463
TRUNK-3706: Add a comment indicating BOM in the first line
Merge pull request #18 from wluyima/TRUNK-3592

proposed concept queue error when saving as concept - TRUNK-3592
TRUNK-1930: Correct @since
Fixing javadoc spacing
Yet another attempt at fixing the randomly failing scheduler service
tests
Adding gitignore files for module files
TRUNK-3594 - adding ProviderEditor
Removed the outdated TODO comment TRUNK-3260
See https://tickets.openmrs.org/browse/TRUNK-3260
Merge pull request #21 from wluyima/TRUNK-3711

Incorrect permissions on encounter role service methods
TRUNK-3379: Upgrade HL7 from 2.5 to 2.6
TRUNK-3501: Show helpful message when purging in-use Field Types
TRUNK-3699: Fix DB clean up in tests
TRUNK-3190: add unit test for HibernateConceptDAO.getConceptsByAnswer
Don't log.warn if no ConceptNameTag exists with the given name (related
to TRUNK-2539)
Merge branch 'master' of https://github.com/openmrs/openmrs-core
Merge pull request #29 from djazayeri/master

Remove an unnecessary log.warn