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
Merge remote-tracking branch 'origin/feature/stabilization'
COMMONS-293 : [Common] Upgrade the portal version to 3.5.8-SNAPSHOT
Merge remote-tracking branch 'origin/feature/stabilization'
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ

Conflicts:
	commons-extension-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
Fix conflicts after merging