fixed merge issue with trunk

git-svn-id: https://svn.apache.org/repos/asf/flex/sdk/branches/develop@1429394 13f79535-47bb-0310-9956-ffa450edef68
Updated SWF metadata to have correct URL and correct locale

git-svn-id: https://svn.apache.org/repos/asf/flex/sdk/branches/develop@1429395 13f79535-47bb-0310-9956-ffa450edef68