Merge branch 'stable-2.1.x'

Conflicts:
	application-mocca-calendar-ui/src/main/resources/MoccaCalendar/MoccaCalendarEventSheet.xml
   - has one htmlescape too much, and reduced whitespace made problems
	pom.xml - version number, of course
Merge commit 'ea627e1'