Merge pull request #30 from webdetails/master

Adding marketplace.xml generation
Rolling back build-breaking build.xml to commit https://github.com/pentaho/marketplace/blob/94affb2d7d81853aa54596fd6b946c99276f372d/build.xml