Updates and deployment tweaks
Merge branch 'master' of github.com:alvar21/clubs_2232