"Extreme programming" and "Estimation planification agile"
Merge branch 'master' into gh-pages