Bug #651. Cutting new's name in calendarPortlet
#968 incorrect display of buttons
merge with master