WIKI-154: Upgrade to use GateIn 3.5.0.Final
WIKI-154: Upgrade to use GateIn 3.5.0.Final
Merge remote-tracking branch 'origin/feature/kill-exobuild' into feature/upgrade-gatein35

Conflicts:
	wiki-service/pom.xml
[update] SWF-2162/DEP-9 : use maven-depmgt-pom 2-SNAPSHOT to have updates for GateIN/JCR upgrades
Merge remote-tracking branch 'origin/feature/kill-exobuild' into feature/upgrade-gatein35

Conflicts:
	pom.xml
DEP-9 : 3rd party deps have to be put in maven-depmgt-pom
Exclude commons-logging
Exclude slf4j-log4j12 with compile scope
Merge remote-tracking branch 'origin/master' into feature/kill-exobuild

Conflicts:
	pom.xml
WIKI-154: Upgrade gatein-3.5.0.Final

Fix test fail: TestWikiDataInjector

WIKI-154: Ugrade gatein-3.5.0 17-12-2012

WIKI-154: Fix test fail

Conflicts:

	pom.xml
	wiki-injector/pom.xml
	wiki-injector/src/test/resources/conf/standalone/repository-configuration.xml
	wiki-injector/src/test/resources/conf/standalone/test-configuration.xml
	wiki-service/pom.xml
	wiki-service/src/main/java/org/exoplatform/wiki/resolver/URLResolver.java
	wiki-service/src/test/java/org/exoplatform/wiki/resolver/AbstractResolverTestcase.java
	wiki-service/src/test/java/org/exoplatform/wiki/resolver/MockUserPortalConfigService.java
	wiki-service/src/test/resources/conf/standalone/organization-configuration.xml
	wiki-service/src/test/resources/conf/standalone/repository-configuration.xml
	wiki-service/src/test/resources/conf/standalone/test-configuration.xml
	wiki-webapp/pom.xml
WIKI-154: Update pom.xml file
WIKI-154: Upgrade JS
PLF-3971 : upgrade parent pom to 9-SNAPSHOT
PLF-3971 : change WAR dependencies to use the pom

Conflicts:

	pom.xml
Merge remote-tracking branch 'origin/master' into feature/kill-exobuild

Conflicts:
	pom.xml
gatein.common forced upgrade is unnecessary
WIKI-154: Fix JS error
WIKI-154: Fix test
WIKI-154: Fix build test fail for wiki-service
WIKI-154: Fix test fail in wiki-service