Re up and Zoom fix
Merge branch 'master' of https://github.com/cgarnier/uppa_planning