dependency changes -- but still need to fix poms
Merge branch 'master' of http://github.com/maurya/openmrs-module-integration

Conflicts:
	api/target/classes/CategoryCombo.hbm.xml
Merge branch 'master' of http://github.com/maurya/openmrs-module-integration
Merge branch 'master' of http://github.com/maurya/openmrs-module-integration

Conflicts:
	omod/src/main/resources/config.xml
	omod/target/classes/config.xml
	pom.xml

resolving conflicts
Roger's WIP 8/31/13
1.  Renamed MappingCohortController to MappingCohortPortletController
and moved up to controller package, eliminated portlet package 
2.  Removed Spring mapping for MappingCohortController from
ModuleApplicationContext to WebModuleApplicationContext and modelled on
HTTPFormFlowsheet module
3.  Added <context> to ModuleApplicationContext
4.  Modified dhis_orgunit, changing parent_id link from uid to id5. 
Modified OrgUnit.hbm.xml removing Report fields, adding code,
changing representation of parent_id to set
6.  Modified OrgUnit.java removing ParentOrg adding ChildOrgs.
API commits of 8/31/13
Omod commits of 8/31/13
api tests are working 8/31
what i did 9/1/13
1.  Restored MasterTemplate.xml, .xsd, Categories-Export.xml, .xsd,
CategoryOptionCombo-Detailed.xml, .xsd, OrganisationUnit-Export.xml,
.xsd, and metaData.xsd to api/resources
2.  Made code required="false" for Option.hbm.xml, OptionSet.hbm.xml,
CategoryCombo.hbm.xml, CategoryOption.hbm.xml, ReportTemplate.hbm.xml,
DataElement.hbm.xml.  Modified dhis_option, dhis_categoryoption,
dhis_reporttemplate, dhis_dataelement to allow nulls in code.  ALTER
TABLE `new19`.`dhis_categoryoption` CHANGE COLUMN `code` `code`
VARCHAR(50) NULL  ;
3.  Made type required="false" for DataElement.hbm.xml.  Modified
dhis_dataelement to allow nulls in type.
4.  Added field uid to CategoryOption.hbm.xml.
5.  Removed field ReportTemplateId from dhis_reporttemplate.  Removed
get/setReportTemplateId, added id property, modified get/set id in
ReportTemplate.java.
6.  Modified mapping of set dataValueTemplates in
ReportTemplate.hbm.xml.
7.  Modified dhis_integrationserver, set username, password, url,
mastertemplate, emailorurl, transport_type nullable.
9/1/13 evening:
1.  Modified DAO GetDataElementByCode to fix field name.
2.  Modified dhis_datavaluetemplate so that dataelement_id,
categoryoption_id and reporttemplate_id can be null.  Modified hbm
similarly.
3.  Changes to DhisXmlUtils:buildObjects to handle unanticipated nulls
(to be investigated)
4.  Change to DhisXmlUtilsTest to use and save in actual DB, working for
allPatients and unidentified cohort definitions
checking commit
Checking working upto portlet
Updated ui Changes
OrgUnit Problem solved
committing changes to
test-hibernate-cfg,config.xml,moduleApplication.xml,testApplicationContext,webModuleApplicationContext.xml
OpenmrsDhisObject abstract class and its uses by the pojos
updated dhisService,Impl,Dao,Hibernate
updated with openmrsDhisObject
Unidentified cohort definition and get routines
1. Changes .xml and .xsd resources for tests
2. api/pom.xml should be returned to its original state after debugging
3. Changed constructors for pojos CategoryCombo, CategoryOption,
DataElement,Option,OptionSet, OrgUnit, ReportTemplate
4. Changed how OpenmrsDhisObject handles empty uids to use
CodeGeneration class from DHIS2; added a test to DhisServiceTest to
check this.
5. Changed HibernateDhisDAO to use new variable names for DataElement,
same with DataElement and ReportTemplate hbm.xml
6. Replaced metaData.xsd with a new one

I believe this is everything I have been working on except for the
ServerMetadata and DhisXmlUtils classes