Update composer.json
Update Form/Type/CalendarType.php

2.1 compatibility
Update Form/Type/EventType.php

2.1 compatibility
Update Form/Type/UsernameType.php

2.1 compatibility
Update Form/Type/AttendeeType.php

2.1 compatibility
Merge branch 'master' into 2.1