BS-2965 : [6.2] overview form: 2 scrollbars
BS-373 : [bug]: Unexpected scroll bar in portal

-In the BonitaForm.html, rename the "Wrap" element into "footerpusher"
-Resize form iFrame using the size of the "footerpusher" element.
BS-2728 user with an avatar is oversized displayed in Organization/Groups/Quick view
BS-2955 [Translation] Confirmation deactivate user popup
Merge branch 'master' of https://github.com/bonitasoft/bonita-web
BS-2900 - after restoring the default theme using the engine API, the
old custom theme was still used by the portal
BS-6594 - Security breach in built URL with actor selector applied on
task

Conflicts:
	console/console-war/src/main/java/org/bonitasoft/console/client/common/view/PerformTaskPage.java
BS-6594 - Security breach in built URL with actor selector applied on
task
Merge branch 'master' of https://github.com/bonitasoft/bonita-web

Conflicts:
	console/console-war/src/main/java/org/bonitasoft/console/client/common/view/PerformTaskPage.java
	forms/forms-view/src/main/java/org/bonitasoft/forms/client/view/common/DOMUtils.java
BS-2907 - Remove '+' character in war folders to make it working on Websphere
Changed jquery+ to jqueryplus
organize imports
BS-625 add title to task primary filters in task page
BS-625 - Change ressource filter title styme
BS-625 - remove icon for categories in processListingAdmin page
BS-625 - add default image for categories ressources filter. User Apps view
BS-625 - add default image for categories ressources filter. Admin Apps view
BS-625 - use darken and @mainAccentColor for resources titles colors
BS-625 - change resource filter header margin
Merge branch 'master' into DataManagement