MOCCACAL-55: Order parameter and add missing i18n keys for the "moccacalendar" macro

- macro translations in separare document due to different scope
- also update calendar templates title description
MOCCACAL-28: Remove 'Content' field when creating a new calendar
Merge branch 'stable-2.1.x'