Syntax correction to fulfill php requirements
artisan
Be carefull with upper/lower chars
Be carefull with upper/lower chars
Torno a fer el commit... em sembla que l'havia esborrat per error
Arreglat el problema amb la FK de quota
.
Merge branch 'development' into fix-master

Conflicts:
	app/controllers/CastellersController.php
	app/routes.php