Fix Search portlet problem with Juzu (update juju 0.6.0-beta5)
PLF-4181 : add ability to start Platform and ask tomcat to explode wars
Merge branch 'master' into feature/unified-search
Merge branch 'master' into feature/unified-search (Add Intranet Home Page)

Conflicts:
	pom.xml
Merge branch 'master' into feature/unified-search (Upgrade Juzu 0.6.0-beta11) + change pom.xml version number for the branch

Conflicts:
	pom.xml
COMMONS-190 : renaming of unified-search artifacts
Merge branch 'master' into feature/unified-search
Merge remote-tracking branch 'origin/master' into feature/unified-search
Merge branch 'master' into feature/unified-search

Conflicts:
	pom.xml
Merge branch 'master' into feature/unified-search
Merge branch 'feature/unified-search'