debug calendar v2
upstream v1
debug/add calendar
Merge remote-tracking branch 'derek/develop' into develop

fusion des deux versions (derek - jeanno)