FORUM-38 | Upgrade to use GateIn 3.5.0.Beta02 - Update pom.xml, new logic getJobName(), Rename 1.2.1 XSD to 1.3
FORUM-38 | Upgrade to use GqteIn 3.5.0.Final
Merge remote-tracking branch 'origin/feature/kill-exobuild' into feature/upgrade-gatein35

Conflicts:
	pom.xml
[update] SWF-2162/DEP-9 : use maven-depmgt-pom 2-SNAPSHOT to have updates for GateIN/JCR upgrades
This property is useless
FORUM-38 | Upgrade to use GqteIn 3.5.0.Final
Merge remote-tracking branch 'origin/feature/kill-exobuild' into feature/upgrade-gatein35

Conflicts:
	answer/service/pom.xml
	application/common/pom.xml
	component/bbcode/pom.xml
	forum/service/pom.xml
	poll/service/pom.xml
	pom.xml
Merge remote-tracking branch 'origin/feature/kill-exobuild' into feature/upgrade-gatein35

Conflicts:
	pom.xml
SWF-2162 : Version must be 4.0.0.Alpha1-kill-exobuild-SNAPSHOT
FORUM-38 | Upgrade to use GateIn 3.5.0.Final
Merge remote-tracking branch 'origin/master' into feature/kill-exobuild

Conflicts:
	pom.xml
FORUM-38 | Upgrade to use GqteIn 3.5.0.Final - fix problem same js module name 'DragDrop' with Calendar-portlet.
FORUM-38 | Upgrade to use GqteIn 3.5.0.Final - fix problem same js module name 'MaskLayerControl' with Calendar-portlet.
FORUM-77 | CLONE - Update the FakeRepositoryService to take into account the changes in the internal interface RepositoryService
Merge remote-tracking branch 'origin/master' into feature/kill-exobuild
FORUM-38 | Upgrade to use GqteIn 3.5.0.Final - Fix javascript error
FORUM-78 | PLF4 - web.xml for all webapps improvements
FORUM-37 Cant modify the permission access in the portlet setting.
Merge remote-tracking branch 'origin/feature/kill-exobuild'
Merge remote-tracking branch 'origin/feature/kill-exobuild' - Change version in pom.xml
Merge remote-tracking branch 'origin/master' into feature/relooking

Conflicts:
	forum/webapp/src/main/java/org/exoplatform/forum/webui/popup/UICategoryForm.java
	forum/webapp/src/main/webapp/javascript/eXo/forum/UIForumPortlet.js
	forum/webapp/src/main/webapp/javascript/eXo/forum/webservice/SearchIpBan.js
	forumResources/src/main/webapp/javascript/eXo/forum/ForumUtils.js
	pom.xml