Club resour+calendario resource
Merge remote-tracking branch 'origin/master'