WL-960 Changed default News tool URL to WebLearn.

WL-960 Make text i18n able (full story, graphic link).

WL-960 Update the enclosures to include details of the type/format.
Update the enclosure HTML a little and add JS libs.
This is so we can add the players inpage.

Conflicts:
	news-tool/tool/src/java/org/sakaiproject/news/tool/NewsAction.java

WL-960 Make text i18n able (full story, graphic link).
WL-1459 Add the Oxford Podcasts tool WL-1459.

Conflicts:
	news-tool/tool/src/webapp/WEB-INF/web.xml
WL-1481 Support in-page player for FLVs as well.
WL-1294 Don't filter the site description.
Conflicts:
	web-tool/tool/src/java/org/sakaiproject/web/tool/IFrameAction.java
WL-2162 Allow the user to configure frames to resize.

Some Web Content tools were resizing too small due to quirks mode and/or floating content. This stops the tool automatically resizing and makes it an option you have to enable.
Conflicts:
	web-tool/tool/src/webapp/vm/web/chef_iframe-annotatedurl-customize.vm
	web-tool/tool/src/webapp/vm/web/chef_iframe.vm
WL-545: new tool based on web content that takes over frame set or indded opens in a "_blank" window

Conflicts:
	web-tool/tool/src/bundle/iframe.properties
	web-tool/tool/src/java/org/sakaiproject/web/tool/IFrameAction.java

WL-545: new tool based on web content
WL-2953 In Web Content forces the checkbox for open in a new window if the protocol is http. Unfortunately the content in the new window is still placed inside an iframe.

WL-2953 Moved English text to language properties file.

WL-2953 Added var to prevent pollution of global namespace

WL-2953 Adds protocol check to the keypress event as workaround to not being able to click on the disabled checkbox.

WL-2953 Adds checks for paste actions on web content options.
WL-2966 Adds a message if there is likely to be blocked mixed web content in an iframe in a popup.

Moves message logic out of options. Uses a friendly message box.
WL-3002 Changing text of Web Content message to reflect the possibility that mixed content is not in fact blocked.
WL-3017 Replaces Site Info URLs that start with http://weblearn.ox.ac.uk to https://

WL-3017 Making the weblearn url go to //weblearn.ox.ac.uk instead of https://

WL-3017 Pulls the server string from the configuration and only applies the fix if the server is accessed from https

WL-3017 changed functionality to drop the whole server base url and uses regular expressions now.

Conflicts:
	web-tool/tool/src/java/org/sakaiproject/web/tool/IFrameAction.java

WL-3017 Also pulls in the server name aliases (e.g. beta.weblearn.ox.ac.uk).

Conflicts:
	web-tool/tool/src/java/org/sakaiproject/web/tool/IFrameAction.java
WL-3171 Update to the local rome releases.

This fixes the bug of rome getting stuck in a loop.
WL-3215 Upgrade the rest of ROME.

This stops the news tool breaking on some deployments because it had 2 copies of rome on it's classpath and depending on directory sorting depended on what got used.
WL-3233 Change description of the web comtent tool

Conflicts:
	web-tool/tool/src/webapp/tools/sakai.iframe.xml