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.