Use specific version 4.1.x-calendar-commons-ckeditor-upgrade-SNAPSHOT and update deps
PLF-5236 : "Who Is Online" portlet took a lot of time when user login
Merge branch 'master' into feature/ckeditor-upgrade
Merge remote-tracking branch 'origin/master' into feature/generic-user-popup
Merge remote-tracking branch 'origin/master' into feature/generic-user-popup
Merge branch 'master' into feature/ckeditor-upgrade
Merge master branch into feature/ck-upgrade branch
Merge branch 'master' into feature/generic-user-popup
Merge branch 'master' into feature/generic-user-popup
Merge branch 'master' into feature/ckeditor-upgrade
Merge branch 'master' into feature/generic-user-popup
Merge branch 'master' into feature/ckeditor-upgrade
Merge remote-tracking branch 'origin/master' into feature/generic-user-popup
UI-2209: align attachment button to left
UI-3014:  Incorrect UI of attach file
Merge remote-tracking branch 'origin/feature/stabilization'
Merge remote-tracking branch 'origin/master' into feature/generic-user-popup
es-ES injection on 20130914-050322

Conflicts:

	calendar-webapp/src/main/resources/locale/portlet/calendar/CalendarPortlet_es_ES.properties
tr injection on 20130914-050322
pt-BR injection on 20130915-050515