No rula res
Merge remote-tracking branch 'origin/master' into Carles
Merge branch 'master' into Carles
Carles: Commit abans del provincies
Carles: Afegit filtre serveis
Carles: Canvis menors
Merge branch 'master' into nova_master

Conflicts:
	src/bonavall/BancdeltempsBundle/Resources/views/Usuari/new.html.twig
Merge branch 'nova_master'
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
Merge pull request #27 from BancDelTempsDAW/Carles

Carles
Carles: Funcionant recerca de serveis
Carles: Funcionant recerca de serveis
Merge pull request #28 from BancDelTempsDAW/Carles

Carles
Ricard: prei a merge