UI-3031 Incorrect UI of Attach File - Select/Upload file in intranet home
SOC-3862 | Incorrect Portal name in notifications
FORUM-661 | Move CssClassManager to commons project.
SOC-3831 | Wrong labels since spec update
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
SOC-3844 | Validates performance of the Notification feature - Add monitoring features for queues
SOC-3843 | Validates performance of the Notification feature - Add a mock mail service

Conflicts:

	commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/service/QueueMessageImpl.java
Merge remote-tracking branch 'origin/feature/stabilization'
SOC-3888 | [Notification] : Remove Queue on QueueMessageImpl and save/get from JCR
COMMONS-293 : [Common] Upgrade the portal version to 3.5.8-SNAPSHOT
Merge remote-tracking branch 'origin/feature/stabilization'
Merge branch 'master' into feature/social-notifications

Conflicts:
	commons-extension-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
SOC-3843 | Validates performance of the Notification feature - Add a mock mail service
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-3843 | Validates performance of the Notification feature - Fix monitoring features for queues