#148
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Aidf/ConaBundle/Resources/config/routing/ical.yml