UI-3031 Incorrect UI of Attach File - Select/Upload file in intranet home
FORUM-661 | Move CssClassManager to commons project.
FORUM-661 SOC-3385 | There are some file type are displayed with default one --> Need to use correct one
SOC-3385 | Change "Upload file." to "Upload file", remove tooltips "No file choise" - default of browser on input file
COMMONS-292 | Resource bundle: translate "minute ago" and related
zh-CN injection on 20130930-102831
SOC-3824 | Activity - Display icon type for the shared attachment
COMMONS-293 : [Common] Upgrade the portal version to 3.5.8-SNAPSHOT
DOC-3043 Platform JAVA APIs: Improve English and consistence

DOC-3043 : Improve Javadoc of API-Settings Context
SOC-3385 | Incorrect UI of Attach File - Select/Upload file in intranet home
SOC-3924 | The tooltip when mouse on the file uploaded is default style, need to apply tooltip style for it.
COMMONS-299 :[Feature][Stabilization] Update CF version
COMMONS-291 : Update version of kernel | core | jcr | ws to be compliant with gatein 3.7.x
COMMONS-291 : Update version of kernel | core | jcr | ws to be compliant with gatein 3.7.x
SWF-2747 : Create upgrade-gatein-3.7.x branch and update projects versions
COMMONS-291 : Update version of kernel | core | jcr | ws to be compliant with gatein 3.7.x (((
* Use the productized version  of gatein 3.7.x-PLF-SNAPSHOT
)))
COMMONS-291 : Update version of kernel | core | jcr | ws to be compliant with gatein 3.7.x (((
* Use gatin OSS version 3.7.0.Alpha02-SNAPSHOT
)))
PLF-5551 : [Gatein-3.7-x] ClassNotFound exception when starting platform server(((
* Fix categories creation issue : Listeners are fired in a wrong order due to auto-registration
)))
Merge remote-tracking branch 'origin/master' into feature/upgrade-gatein-3.7.x-temp

Conflicts:
	commons-testing/src/main/java/org/exoplatform/commons/testing/mock/SimpleMockOrganizationService.java
	commons-webui-component/src/main/resources/locale/commons/Commons_zh_CN.properties
	pom.xml
Merge Master to FB