Merge branch 'master' into feature/stabilization
es-ES injection on 20140708-004953
PLF-5978 Groovy compilation exception while clicking on featured products from acme home page

Fix description: use PropertyValueComparator class from ECMS core utils.
Merge branch 'feature/stabilization'
Merge branch 'master' into feature/stabilization
PLF-5248: i18n in Login History gadget
PLF-5917:Ensure that all the endRequest methods will be called despite whatever happens

Fix description
* Add EndRequest in finally block .
* Check if the user was already synchronized before invoking membership
PLF-5928: i18n of Memory gadget - Loading data label
PLF-5931: i18n of Template Statistics, Application Statistics gadgets

Conflicts:
	exo-gadget-pack/gadget-pack/src/main/webapp/gadgets/Management-and-Monitoring-gadgets/Statistics/Applications.xml
	exo-gadget-pack/gadget-pack/src/main/webapp/gadgets/Management-and-Monitoring-gadgets/Statistics/locale/default.xml
PLF-5931: Update key name
PLF-5932: Membership Pagination doesn't work

Fix description:
- Make IDM configration from Gatein and Platform consistent
PLF-5962: [Application Registry] Hide Import Applications button by default
PLF-5968: Normal user can change branding settings

Fix description:
- Only allow administrator saving branding settings
- Use ConversationState to check if user is admin or not

Conflicts:
	extension/portlets/branding/src/main/java/org/exoplatform/platform/portlet/juzu/branding/BrandingController.java
	extension/portlets/branding/src/main/resources/locale/portlet/branding/branding_en.properties
PLF-5930: i18n of Cache Level gadget

Conflicts:
	exo-gadget-pack/gadget-pack/src/main/webapp/gadgets/Management-and-Monitoring-gadgets/Monitoring/Caches.xml
	exo-gadget-pack/gadget-pack/src/main/webapp/gadgets/Management-and-Monitoring-gadgets/Monitoring/locale/default.xml
PLF-5880: Externalize the import mode in portal-data upgrade plugin

Fix description:
- Externalize the import mode for acme and intranet website

Conflicts:
	samples/acme-intranet/webapp/src/main/webapp/WEB-INF/conf/office-extension/portal/portal-configuration.xml
fr injection on 20140716-004923
vi injection on 20140716-004923
ar injection on 20140716-004923
ja injection on 20140716-004923
de injection on 20140716-004923