Correction of name
Merge branch 'master' of github.com:zapoyok/HolidayBundle

Conflicts:
	composer.json