fix conflits
fix merge
Merge branch 'master' of https://github.com/RemiNV/edtemps-ecn