WL-670 Change Contributor to Participant.
This is a huge change for such a simple underlying change.
I haven't changed old migration scripts, or the Oracle SQL.

Conflicts:
	messageforums-help/src/sakai_forums/atdt.html
Updated JavaDoc.
Revert SAK-24829 for en_GB locale.

SAK-24829 changed lots of localisation strings but in the process lost some of the en_GB locale changes, SAK-26228 is the issue to fix the en_GB locale.
WL-888 Update forums for 2.6.x

Conflicts:
	messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
WL-894 Put the footer at the top of the message.
WL-1054 Added how to alter forum notification settings as footer to e-mail.

As the e-mail is already HTML, the footer includes a hyperlink to take the user
to the corresponding forum. Unfortunately, due to the tool remembering state, if
the user is already logged in, they may not see the 'Watch' link. However, there
is no way to establish the reset URL by querying the API, so unfortunately
crafting this by hand might break in a future implementation. Thus the message
includes a hint that a tool reset may be required. (I also added a blank line of
padding above the body of the message post, as I think this improves the
presentation).

Conflicts:
	messageforums-app/src/java/org/sakaiproject/tool/messageforums/ForumsEmailService.java
WL-1685 WL-943 Rewrite forum/topic descriptions.

Conflicts:
	messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/DiscussionForumServiceImpl.java
	pom.xml
BSGAPP-16 Markup Free flag added to Forum Settings

Conflicts:
	messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
	messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/DiscussionForumBean.java
	messageforums-app/src/webapp/jsp/dfReviseForumSettingsAttach.jsp
	messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/OpenForum.hbm.xml
BSGAPP-12 WP5.1 extra web services

WL-1949 Stack trace when creating a new Forum.
WL-2020 Exception editing topic settings
WL-2021 When saving a message in messages don't load topic.
WL-2141 Make sure hibernate session stays with transaction.
WL-2225 Photo URL via forums API
WL-2249 Fix permission checks in direct/forums

When a message is created in the messages tool there isn't a topic associated with it. Now we check and don't fall over when this is the case.

Move DecoratedMessage from inner class to class

Fix to deleteMessage

Bugfix to forums.newtopic event

The problem with msgcntr seems to be that the hibernate session doesn't stick around with the transaction, which means that all the lazy loading doesn't work outside the current method. Adding the HibernateInterceptor fixes this.

Conflicts:
	messageforums-api/src/java/org/sakaiproject/api/app/messageforums/ui/UIPermissionsManager.java
	messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/entity/ForumTopicEntityProviderImpl.java
	messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/ui/DiscussionForumManagerImpl.java
	messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/ui/UIPermissionsManagerImpl.java
WL-2482 Improve filtering of HTML -> plain text.
WL-2398 Stripping HTML from plaintext forums
WL-2580 Stop confusing JSF by not following beans.
WL-2584 Plain text forums are sending plain text.
WL-3100 Remove roles from forums permissions

The forums tool does not correctly handle permissions for roles in the
forums settings page. As this is the case and the forums tool uses a
proprietary permissions management system, we have removed the roles
from being displayed in the dropdown list.

As far as we can tell the groups and special roles all work as expected.