stubs ciutat
relations stubs
Merge branch 'josep'
Merge branch 'pol'
yeaaaaah