Carles: Va a petar tot
Merge remote-tracking branch 'origin/master' into Carles

Conflicts:
	src/bonavall/BancdeltempsBundle/Resources/config/routing.yml
	src/bonavall/BancdeltempsBundle/Resources/views/Default/skel.html.twig
	src/bonavall/BancdeltempsBundle/Resources/views/Default/userSolicituts.html.twig
Carles: Aixo fallara