stubs ciutat
relations stubs
Merge branch 'josep'