Crowdin injection w25 (from 20140614 to 20140617)
Merge branch 'stable/4.0.x' into feature/4.0.x-translation

Conflicts:
	calendar-webapp/src/main/resources/locale/portlet/calendar/CalendarPortlet_ru.properties
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt