Merge pull request #24 from webdetails/5.0

Marketplace 5.0 sync
Reverted metadata site to official location