graphics
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Sharif/CalendarBundle/Resources/config/routing.yml
calendar