CalendarHelper formGroup -> inputGroup
Merge branch 'formgroup'