Merge branch 'master' into feature/stabilization
Crowdin injection w3 - Add Norwegian files on 20140116
EXOGTN-1677: [IE]: Action does not work when page URL contains special characters

Fix description:
	- Replace href by onclick to call ajax

Conflicts:

	platform-ui-web-eXoResources/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/webui/core/UIPageIterator.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/webui/organization/account/UIGroupSelector.gtmpl
Crowdin injection w3 - Add Norwegian files on 20140116
EXOGTN-1677: [IE]: Action does not work when page URL contains special characters

Fix description:
	- Replace href by onclick to call ajax

Conflicts:

	platform-ui-web-eXoResources/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/webui/core/UIPageIterator.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/webui/organization/account/UIGroupSelector.gtmpl
Merge branch 'master' into feature/stabilization
Merge branch 'feature/stabilization'
Merge branch 'feature/stabilization' : Correct Pom's version
Merge remote-tracking branch 'origin/master' into feature/stabilization
Merge remote-tracking branch 'origin/master' into feature/stabilization
UI-3197 Add function create Margin and Padding Class
Crowdin injection w4 - Update Norwegian file on 20140121
Crowdin injection w5 - Update French label on 20140128
Crowdin injection w6 - Update Russian files from 20140130 to 20140205
EXOGTN-1736: Upgrade to bootstrap 2.2.2
Merge branch 'feature/stabilization'
Merge branch 'master' into feature/upgrade-gatein-3.7.x

Conflicts:
	platform-ui-web-eXoResources/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/organization/webui/component/UIGroupManagement.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/portal/webui/page/UIPageSearchForm.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/webui/core/UIBreadcumbs.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/webui/core/UITree.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/webui/organization/account/UIGroupSelector.gtmpl
	platform-ui-web-eXoResources/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl