The Upload widget is being rendered correctly. Images are getting Uploaded to correct location.
The Upload widget is being rendered correctly. Images are getting Uploaded to correct location.
& few minor changes
Merge branch 'zephyr' of https://github.com/jibesh/openmrs-module-htmlformentry into zephyr

Conflicts:
	omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java
Minor Changes regarding the filepath
All types of files are getting uploaded & rendered correctly
Merge remote-tracking branch 'upstream/master' into zephyr-updated

Conflicts:
	api/src/main/java/org/openmrs/module/htmlformentry/FormEntryContext.java
	api/src/main/java/org/openmrs/module/htmlformentry/HtmlFormEntryUtil.java
	api/src/main/java/org/openmrs/module/htmlformentry/element/ObsSubmissionElement.java
	api/src/test/java/org/openmrs/module/htmlformentry/WidgetTest.java
	omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java
	omod/src/main/webapp/htmlFormEntry.jsp
TESTS running fine in with configuration 1.9 & 1.8
Wrote the tests
Everything running fine in openmrs 1.6, 1.8, 1.9 configurations
Removing a small bug
merged in latest trunk branch
made various formatting changes
HTML-494 - Support for displaying one of a group of followup sections, depending on the answer to a coded obs
fixing merge conflicts
Merge pull request #56 from djazayeri/HTML-494

HTML-494 - Support for displaying one of a group of followup sections, depending on the answer to a coded obs
removing unused import
HTML-499 - Error re-displaying a form if an unmatched obs group has a $ in its content
HTML-114 - Support creation of observations with a drug as a value
HTML-501 - beforeValidation doesn't work
HTML_500, add answerLocationTags attribute to Obs widget
HTL-500, localize the locations names