Modules folder should be configured via a runtime property, not a global
property, and it should default to a folder that depends on the webapp
name - TRUNK-3754
Merge pull request #133 from wluyima/TRUNK-3754

Modules folder should be configured via a runtime property, not a global property, and it should default to a folder that depends on the webapp name - TRUNK-3754
Removed stray line calling Thread.sleep in ModuleUtilTest - TRUNK-3754
TRUNK-3845: Short class name in BaseOpenmrsObject toString
New visit save errors should not clear new encounter rows - TRUNK-2969
Merge pull request #143 from dkayiwa/TRUNK-2969

New visit save errors should not clear new encounter rows - TRUNK-2969
TRUNK-3847
TRUNK-3846
Merge pull request #147 from lluismf/TRUNK-3846

TRUNK-3846 Deleting a patient should not require name and identifier
Merge pull request #146 from lluismf/TRUNK-3847

TRUNK-3847 Address layout management is mislabeled in the application
No override the module´s messages in the module_message.properties -
TRUNK-2187
Merge pull request #151 from dkayiwa/TRUNK-2187

No override the module´s messages in the module_message.properties - TRUNK-2187
TRUNK-3856: More indentation on location hierarchy "simple" widget
TRUNK-3252: Make method safe by modifying algorithm
TRUNK-3185: Refactor method public static void
setVolatileUserData(String key, Object value) in class
org.openmrs.api.context.Context
TRUNK-3853 and TRUNK-3414
DrugOrderValidator should allow a drug order with either a concept or
drug - TRUNK-3008
Merge pull request #157 from lluismf/TRUNK-3185

TRUNK-3185: Refactor method public static void setVolatileUserData(String key, Object value) in class org.openmrs.api.context.Context
Merge pull request #156 from lluismf/TRUNK-3252

TRUNK-3252: Make method safe by modifying algorithm
Merge pull request #155 from lluismf/TRUNK-3856

TRUNK-3856: More indentation on location hierarchy "simple" widget