add calendar
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/PCA/BillingBundle/Resources/config/routing.yml
	src/PCA/UserBundle/Resources/views/Pet/index.html.twig