agile mission & client part
Merge branch 'master' into gh-pages