add the optionresolver for calendartype symfony2.2
Merge branch 'master' of https://github.com/claroline/Claroline

Conflicts:
	src/core/Claroline/CoreBundle/Form/CalendarType.php